diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /arch/powerpc/mm/hugetlbpage.c | |
| parent | cea555d384b85271035814c5adad23e6c7fc5d2a (diff) | |
| parent | 2434bbb30e79468c49cff3cff6005236f55ed188 (diff) | |
Merge branch 'merge'
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 c2231358adbb..deb494687a65 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
| @@ -676,7 +676,7 @@ repeat: | |||
| 676 | return err; | 676 | return err; |
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | void set_huge_psize(int psize) | 679 | static void __init set_huge_psize(int psize) |
| 680 | { | 680 | { |
| 681 | /* Check that it is a page size supported by the hardware and | 681 | /* Check that it is a page size supported by the hardware and |
| 682 | * that it fits within pagetable limits. */ | 682 | * that it fits within pagetable limits. */ |