aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/mm/hugetlbpage.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-03 12:54:45 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-03 12:54:45 +0100
commitc36910c147fd7b129a8f1269c76b9767c99de5cd (patch)
tree29403cd341b62581718f6b34944271980fb133e6 /arch/powerpc/mm/hugetlbpage.c
parentx86: fix broken flushing in GART nofullflush path (diff)
parentAMD IOMMU: fix possible race while accessing iommu->need_sync (diff)
downloadlinux-dev-c36910c147fd7b129a8f1269c76b9767c99de5cd.tar.xz
linux-dev-c36910c147fd7b129a8f1269c76b9767c99de5cd.zip
Merge branch 'iommu-fixes-2.6.28' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent
Diffstat (limited to 'arch/powerpc/mm/hugetlbpage.c')
-rw-r--r--arch/powerpc/mm/hugetlbpage.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index a117024ab8cd..7bbf4e4ed430 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -677,7 +677,7 @@ repeat:
return err;
}
-void set_huge_psize(int psize)
+static void __init set_huge_psize(int psize)
{
/* Check that it is a page size supported by the hardware and
* that it fits within pagetable limits. */