diff options
| author | Michael Ellerman | 2015-08-07 08:19:45 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2015-08-18 11:31:55 +0200 |
| commit | 953005770ec3b52132a4cdbdbce74bd0de2b8490 (patch) | |
| tree | bbffe328e9cbecb6ec321ed50b06e1f318a83cd4 | |
| parent | powerpc/cell: Drop support for 64K local store on 4K kernels (diff) | |
| download | kernel-qcow2-linux-953005770ec3b52132a4cdbdbce74bd0de2b8490.tar.gz kernel-qcow2-linux-953005770ec3b52132a4cdbdbce74bd0de2b8490.tar.xz kernel-qcow2-linux-953005770ec3b52132a4cdbdbce74bd0de2b8490.zip | |
powerpc/mm: Drop the 64K on 4K version of pte_pagesize_index()
Now that support for 64k pages with a 4K kernel is removed, this code is
unreachable.
CONFIG_PPC_HAS_HASH_64K can only be true when CONFIG_PPC_64K_PAGES is
also true.
But when CONFIG_PPC_64K_PAGES is true we include pte-hash64.h which
includes pte-hash64-64k.h, which defines both pte_pagesize_index() and
crucially __real_pte, which means this definition can never be used.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| -rw-r--r-- | arch/powerpc/include/asm/pgtable-ppc64.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h index 7ee2300ee392..fa1dfb7f7b48 100644 --- a/arch/powerpc/include/asm/pgtable-ppc64.h +++ b/arch/powerpc/include/asm/pgtable-ppc64.h @@ -134,23 +134,11 @@ #define pte_iterate_hashed_end() } while(0) -#ifdef CONFIG_PPC_HAS_HASH_64K /* * We expect this to be called only for user addresses or kernel virtual * addresses other than the linear mapping. */ -#define pte_pagesize_index(mm, addr, pte) \ - ({ \ - unsigned int psize; \ - if (is_kernel_addr(addr)) \ - psize = MMU_PAGE_4K; \ - else \ - psize = get_slice_psize(mm, addr); \ - psize; \ - }) -#else #define pte_pagesize_index(mm, addr, pte) MMU_PAGE_4K -#endif #endif /* __real_pte */ |