From: Tony Breeds <tony@bakeyournoodle.com>
Date: Thu, 31 Jul 2008 03:51:42 +0000 (+1000)
Subject: powerpc: Guard htab_dt_scan_hugepage_blocks appropriately
X-Git-Tag: v2.6.28-rc1~569^2~93
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e16a9c0990a18ee2f2874363392fdfedcf9ded58;p=~emulex%2Finfiniband.git

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>
---

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 14be408dfc9..7efcb9c5217 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,
 	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)
 {