The patch titled Subject: mm: hugetlb: allow hugepages_supported to be architecture specific has been added to the -mm tree. Its filename is mm-hugetlb-allow-hugepages_supported-to-be-architecture-specific.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-hugetlb-allow-hugepages_supported-to-be-architecture-specific.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-hugetlb-allow-hugepages_supported-to-be-architecture-specific.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dominik Dingel <dingel@xxxxxxxxxxxxxxxxxx> Subject: mm: hugetlb: allow hugepages_supported to be architecture specific s390 has a constant hugepage size, by setting HPAGE_SHIFT we also change e.g. the pageblock_order, which should be independent in respect to hugepage support. With this patch every architecture is free to define how to check for hugepage support. Signed-off-by: Dominik Dingel <dingel@xxxxxxxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx> Cc: Michael Holzheu <holzheu@xxxxxxxxxxxxxxxxxx> Cc: Gerald Schaefer <gerald.schaefer@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/hugetlb.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff -puN include/linux/hugetlb.h~mm-hugetlb-allow-hugepages_supported-to-be-architecture-specific include/linux/hugetlb.h --- a/include/linux/hugetlb.h~mm-hugetlb-allow-hugepages_supported-to-be-architecture-specific +++ a/include/linux/hugetlb.h @@ -460,15 +460,14 @@ static inline spinlock_t *huge_pte_lockp return &mm->page_table_lock; } -static inline bool hugepages_supported(void) -{ - /* - * Some platform decide whether they support huge pages at boot - * time. On these, such as powerpc, HPAGE_SHIFT is set to 0 when - * there is no such support - */ - return HPAGE_SHIFT != 0; -} +#ifndef hugepages_supported +/* + * Some platform decide whether they support huge pages at boot + * time. Some of them, such as powerpc, set HPAGE_SHIFT to 0 + * when there is no such support + */ +#define hugepages_supported() (HPAGE_SHIFT != 0) +#endif #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; _ Patches currently in -mm which might be from dingel@xxxxxxxxxxxxxxxxxx are revert-s390-mm-change-hpage_shift-type-to-int.patch revert-s390-mm-make-hugepages_supported-a-boot-time-decision.patch mm-hugetlb-allow-hugepages_supported-to-be-architecture-specific.patch s390-hugetlb-add-hugepages_supported-define.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