diff options
author | Tony Breeds <tony@bakeyournoodle.com> | 2008-07-30 23:51:42 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-08-20 02:34:57 -0400 |
commit | e16a9c0990a18ee2f2874363392fdfedcf9ded58 (patch) | |
tree | 8121cdd53351b9eaf87a7f4a99cac9c0b6330b8c /arch | |
parent | 5df72bf3f7345a84f5ef274bf72a4546caf3ad02 (diff) |
powerpc: Guard htab_dt_scan_hugepage_blocks appropriately
htab_dt_scan_hugepage_blocks is only used when CONFIG_HUGETLB_PAGE is
defined, so guard the declaration likewise.
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 14be408dfc9b..7efcb9c5217c 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
@@ -343,6 +343,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node, | |||
343 | return 0; | 343 | return 0; |
344 | } | 344 | } |
345 | 345 | ||
346 | #ifdef CONFIG_HUGETLB_PAGE | ||
346 | /* Scan for 16G memory blocks that have been set aside for huge pages | 347 | /* Scan for 16G memory blocks that have been set aside for huge pages |
347 | * and reserve those blocks for 16G huge pages. | 348 | * and reserve those blocks for 16G huge pages. |
348 | */ | 349 | */ |
@@ -380,6 +381,7 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node, | |||
380 | add_gpage(phys_addr, block_size, expected_pages); | 381 | add_gpage(phys_addr, block_size, expected_pages); |
381 | return 0; | 382 | return 0; |
382 | } | 383 | } |
384 | #endif /* CONFIG_HUGETLB_PAGE */ | ||
383 | 385 | ||
384 | static void __init htab_init_page_sizes(void) | 386 | static void __init htab_init_page_sizes(void) |
385 | { | 387 | { |