Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8c37c48 authored by Naoya Horiguchi's avatar Naoya Horiguchi Committed by Linus Torvalds
Browse files

thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE 



These macros will be used in a later patch, where all usages are expected
to be optimized away without #ifdef CONFIG_TRANSPARENT_HUGEPAGE.  But to
detect unexpected usages, we convert the existing BUG() to BUILD_BUG().

[akpm@linux-foundation.org: fix build in mm/pgtable-generic.c]
Signed-off-by: default avatarNaoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Acked-by: default avatarHillf Danton <dhillf@gmail.com>
Reviewed-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d32ff84

include/linux/huge_mm.h

+6 −5
Original line number Diff line number Diff line
@@ -51,6 +51,9 @@ extern pmd_t *page_check_address_pmd(struct page *page, 
				     unsigned long address,

				     enum page_check_address_pmd_flag flag);



#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)

#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define HPAGE_PMD_SHIFT HPAGE_SHIFT

#define HPAGE_PMD_MASK HPAGE_MASK
@@ -102,8 +105,6 @@ extern void __split_huge_page_pmd(struct mm_struct *mm, pmd_t *pmd); 
		BUG_ON(pmd_trans_splitting(*____pmd) ||			\

		       pmd_trans_huge(*____pmd));			\

	} while (0)

#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)

#define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)

#if HPAGE_PMD_ORDER > MAX_ORDER

#error "hugepages can't be allocated by the buddy allocator"

#endif
@@ -158,9 +159,9 @@ static inline struct page *compound_trans_head(struct page *page) 
	return page;

}

#else /* CONFIG_TRANSPARENT_HUGEPAGE */

#define HPAGE_PMD_SHIFT ({ BUG(); 0; })

#define HPAGE_PMD_MASK ({ BUG(); 0; })

#define HPAGE_PMD_SIZE ({ BUG(); 0; })

#define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })

#define HPAGE_PMD_MASK ({ BUILD_BUG(); 0; })

#define HPAGE_PMD_SIZE ({ BUILD_BUG(); 0; })



#define hpage_nr_pages(x) 1

mm/pgtable-generic.c

+3 −2
Original line number Diff line number Diff line
@@ -70,10 +70,11 @@ int pmdp_clear_flush_young(struct vm_area_struct *vma, 
			   unsigned long address, pmd_t *pmdp)

{

	int young;

#ifndef CONFIG_TRANSPARENT_HUGEPAGE

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	VM_BUG_ON(address & ~HPAGE_PMD_MASK);

#else

	BUG();

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

	VM_BUG_ON(address & ~HPAGE_PMD_MASK);

	young = pmdp_test_and_clear_young(vma, address, pmdp);

	if (young)

		flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);