diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-03 06:54:45 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-03 06:54:45 -0500 |
| commit | c36910c147fd7b129a8f1269c76b9767c99de5cd (patch) | |
| tree | 29403cd341b62581718f6b34944271980fb133e6 /arch/powerpc/mm/hugetlbpage.c | |
| parent | 70d7d357578245f1993fd2d3ccd26088bcd38941 (diff) | |
| parent | 09ee17eb8ea89514c13980c4010bdbbaea8630c2 (diff) | |
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.c | 2 |
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: | |||
| 677 | return err; | 677 | return err; |
| 678 | } | 678 | } |
| 679 | 679 | ||
| 680 | void set_huge_psize(int psize) | 680 | static void __init set_huge_psize(int psize) |
| 681 | { | 681 | { |
| 682 | /* Check that it is a page size supported by the hardware and | 682 | /* Check that it is a page size supported by the hardware and |
| 683 | * that it fits within pagetable limits. */ | 683 | * that it fits within pagetable limits. */ |