[PATCH] powerc: fix build failure when CONFIG_HUGETLB_PAGE is not set

* [PATCH] powerc: fix build failure when CONFIG_HUGETLB_PAGE is not set
@ 2014-10-27 14:30 Cédric Le Goater
  2014-10-28  4:31 ` Michael Ellerman
  0 siblings, 1 reply; 3+ messages in thread
From: Cédric Le Goater @ 2014-10-27 14:30 UTC (permalink / raw)
  To: mpe; +Cc: Cédric Le Goater, linuxppc-dev

  CC      arch/powerpc/mm/slice.o
In file included from ../arch/powerpc/mm/slice.c:33:0:
../include/linux/hugetlb.h:141:47: error: expected identifier or ‘(’ before numeric constant
 #define is_hugepage_only_range(mm, addr, len) 0
                                               ^
../arch/powerpc/mm/slice.c:704:5: note: in expansion of macro ‘is_hugepage_only_range’
 int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
     ^

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---
 arch/powerpc/mm/slice.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 8d7bda94d196..89bc01222649 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -682,6 +682,7 @@ void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
 	slice_convert(mm, mask, psize);
 }
 
+#ifdef CONFIG_HUGETLB_PAGE
 /*
  * is_hugepage_only_range() is used by generic code to verify whether
  * a normal mmap mapping (non hugetlbfs) is valid on a given area.
@@ -727,3 +728,4 @@ int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,
 	return !slice_check_fit(mask, available);
 }
 
+#endif
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread