diff options
| author | Becky Bruce | 2011-11-29 16:10:39 +0100 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2011-12-07 06:26:24 +0100 |
| commit | 1f6820b4c1d09b017625ce32ba23fa39ebfdb27a (patch) | |
| tree | b3c1f88fa415d5d8bbb4ca90063467aeaead68f1 /arch/powerpc/include | |
| parent | powerpc/book3e: Change hugetlb preload to take vma argument (diff) | |
| download | kernel-qcow2-linux-1f6820b4c1d09b017625ce32ba23fa39ebfdb27a.tar.gz kernel-qcow2-linux-1f6820b4c1d09b017625ce32ba23fa39ebfdb27a.tar.xz kernel-qcow2-linux-1f6820b4c1d09b017625ce32ba23fa39ebfdb27a.zip | |
powerpc: Define/use HUGETLB_NEED_PRELOAD insead of complicated #if
Define HUGETLB_NEED_PRELOAD in mmu-book3e.h for CONFIG_PPC64 instead
of having a much more complicated #if block. This is easier to read
and maintain.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/include')
| -rw-r--r-- | arch/powerpc/include/asm/hugetlb.h | 3 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/mmu-book3e.h | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h index 863f49d5ea35..dfdb95bc59a5 100644 --- a/arch/powerpc/include/asm/hugetlb.h +++ b/arch/powerpc/include/asm/hugetlb.h @@ -124,8 +124,7 @@ static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, pte_t pte, int dirty) { -#if defined(CONFIG_PPC_MMU_NOHASH) && \ - !(defined(CONFIG_PPC_FSL_BOOK3E) && defined(CONFIG_PPC32)) +#ifdef HUGETLB_NEED_PRELOAD /* * The "return 1" forces a call of update_mmu_cache, which will write a * TLB entry. Without this, platforms that don't do a write of the TLB diff --git a/arch/powerpc/include/asm/mmu-book3e.h b/arch/powerpc/include/asm/mmu-book3e.h index 50210b9b0147..f5f89cafebd0 100644 --- a/arch/powerpc/include/asm/mmu-book3e.h +++ b/arch/powerpc/include/asm/mmu-book3e.h @@ -258,6 +258,13 @@ extern int mmu_vmemmap_psize; #ifdef CONFIG_PPC64 extern unsigned long linear_map_top; + +/* + * 64-bit booke platforms don't load the tlb in the tlb miss handler code. + * HUGETLB_NEED_PRELOAD handles this - it causes huge_ptep_set_access_flags to + * return 1, indicating that the tlb requires preloading. + */ +#define HUGETLB_NEED_PRELOAD #endif #endif /* !__ASSEMBLY__ */ |