Christophe Leroy <christophe.le...@c-s.fr> writes:
> Only nohash/32 and book3s/64 support mm slices.
>
Reviewed-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
> Signed-off-by: Christophe Leroy <christophe.le...@c-s.fr>
> ---
> arch/powerpc/include/asm/nohash/64/slice.h | 12 ------------
> arch/powerpc/include/asm/slice.h | 4 +---
> arch/powerpc/platforms/Kconfig.cputype | 4 ++++
> 3 files changed, 5 insertions(+), 15 deletions(-)
> delete mode 100644 arch/powerpc/include/asm/nohash/64/slice.h
>
> diff --git a/arch/powerpc/include/asm/nohash/64/slice.h
> b/arch/powerpc/include/asm/nohash/64/slice.h
> deleted file mode 100644
> index ad0d6e3cc1c5..000000000000
> --- a/arch/powerpc/include/asm/nohash/64/slice.h
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#ifndef _ASM_POWERPC_NOHASH_64_SLICE_H
> -#define _ASM_POWERPC_NOHASH_64_SLICE_H
> -
> -#ifdef CONFIG_PPC_64K_PAGES
> -#define get_slice_psize(mm, addr) MMU_PAGE_64K
> -#else /* CONFIG_PPC_64K_PAGES */
> -#define get_slice_psize(mm, addr) MMU_PAGE_4K
> -#endif /* !CONFIG_PPC_64K_PAGES */
> -#define slice_set_user_psize(mm, psize) do { BUG(); } while (0)
> -
> -#endif /* _ASM_POWERPC_NOHASH_64_SLICE_H */
> diff --git a/arch/powerpc/include/asm/slice.h
> b/arch/powerpc/include/asm/slice.h
> index 44816cbc4198..be8af667098f 100644
> --- a/arch/powerpc/include/asm/slice.h
> +++ b/arch/powerpc/include/asm/slice.h
> @@ -4,9 +4,7 @@
>
> #ifdef CONFIG_PPC_BOOK3S_64
> #include <asm/book3s/64/slice.h>
> -#elif defined(CONFIG_PPC64)
> -#include <asm/nohash/64/slice.h>
> -#elif defined(CONFIG_PPC_MMU_NOHASH)
> +#elif defined(CONFIG_PPC_MMU_NOHASH_32)
> #include <asm/nohash/32/slice.h>
> #endif
>
> diff --git a/arch/powerpc/platforms/Kconfig.cputype
> b/arch/powerpc/platforms/Kconfig.cputype
> index 00b2bb536c74..04915f51f447 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -391,6 +391,10 @@ config PPC_MMU_NOHASH
> def_bool y
> depends on !PPC_BOOK3S
>
> +config PPC_MMU_NOHASH_32
> + def_bool y
> + depends on PPC_MMU_NOHASH && PPC32
> +
> config PPC_BOOK3E_MMU
> def_bool y
> depends on FSL_BOOKE || PPC_BOOK3E
> --
> 2.13.3
