The patch titled
Subject: hugetlb: provide a default HPAGE_SHIFT if !CONFIG_HUGETLB_PAGE
has been removed from the -mm tree. Its filename was
hugetlb-provide-a-default-hpage_shift-if-config_hugetlb_page.patch
This patch was dropped because other changes were merged, which wrecked this patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
From: David Daney <david.daney@xxxxxxxxxx>
Subject: hugetlb: provide a default HPAGE_SHIFT if !CONFIG_HUGETLB_PAGE
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 gives us
runtime safety if someone were to use HPAGE_SIZE incorrectly.
Signed-off-by: David Daney <david.daney@xxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/hugetlb.h | 1 +
1 file changed, 1 insertion(+)
diff -puN include/linux/hugetlb.h~hugetlb-provide-a-default-hpage_shift-if-config_hugetlb_page include/linux/hugetlb.h
--- a/include/linux/hugetlb.h~hugetlb-provide-a-default-hpage_shift-if-config_hugetlb_page
+++ a/include/linux/hugetlb.h
@@ -113,6 +113,7 @@ static inline void copy_huge_page(struct
#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 */
_
Patches currently in -mm which might be from david.daney@xxxxxxxxxx are
origin.patch
linux-next.patch
hugetlb-provide-safer-dummy-values-for-hpage_mask-and-hpage_size.patch
hugetlb-provide-safer-dummy-values-for-hpage_mask-and-hpage_size-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
