powerpc: Guard htab_dt_scan_hugepage_blocks appropriately
authorTony Breeds <tony@bakeyournoodle.com>
Thu, 31 Jul 2008 03:51:42 +0000 (13:51 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 20 Aug 2008 06:34:57 +0000 (16:34 +1000)
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>
arch/powerpc/mm/hash_utils_64.c

index 14be408dfc9bdfcdad5ecd9855f2e06e07e4390f..7efcb9c5217c91c27294d852d393dda715e8907b 100644 (file)
@@ -343,6 +343,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
        return 0;
 }
 
+#ifdef CONFIG_HUGETLB_PAGE
 /* Scan for 16G memory blocks that have been set aside for huge pages
  * and reserve those blocks for 16G huge pages.
  */
@@ -380,6 +381,7 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node,
        add_gpage(phys_addr, block_size, expected_pages);
        return 0;
 }
+#endif /* CONFIG_HUGETLB_PAGE */
 
 static void __init htab_init_page_sizes(void)
 {