From: David Daney <david.daney@xxxxxxxxxx>
When linux-next 10111117 is build for MIPS with
cavium-octeon_defconfig, we get:
arch/mips/mm/tlb-r4k.c: In function 'local_flush_tlb_range':
arch/mips/mm/tlb-r4k.c:129:28: error: 'HPAGE_SHIFT' undeclared (first use in this function)
The fix is to supply a dummy HPAGE_SHIFT in the !CONFIG_HUGETLB_PAGE
case. Instead of supplying the non-huge value, as was done for
HPAGE_MASK and HPAGE_SIZE, we do BUG() instead. This satisfies the
compiler, but give us runtime safety if someone were to use HPAGE_SIZE
incorrectly.
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
---
include/linux/hugetlb.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
index 19644e0..380451c 100644
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
@@ -113,6 +113,7 @@ static inline void copy_huge_page(struct page *dst, struct page *src)
#ifndef HPAGE_MASK
#define HPAGE_MASK PAGE_MASK /* Keep the compiler happy */
#define HPAGE_SIZE PAGE_SIZE
+#define HPAGE_SHIFT ({BUG(); 0; })
#endif
#endif /* !CONFIG_HUGETLB_PAGE */
--
1.7.2.3
