Commit e0d68273 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Remove CONFIG_PPC_BOOK3E 



CONFIG_PPC_BOOK3E is redundant with CONFIG_PPC_BOOK3E_64.

The later is more explicit about the fact that it's a 64 bits target.

Remove CONFIG_PPC_BOOK3E.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5d0891490813c19cdcfc04678f512ea68cba3e64.1663606876.git.christophe.leroy@csgroup.eu
parent d7216567

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ config PPC64_SUPPORTS_MEMORY_FAILURE 


config KEXEC

	bool "kexec system call"

	depends on (PPC_BOOK3S || PPC_85xx || (44x && !SMP)) || PPC_BOOK3E

	depends on (PPC_BOOK3S || PPC_85xx || (44x && !SMP)) || PPC_BOOK3E_64

	select KEXEC_CORE

	help

	  kexec is a system call that implements the ability to shutdown your

arch/powerpc/include/asm/cputable.h

+2 −2
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static inline void cpu_feature_keys_init(void) { } 
#define CPU_FTRS_COMPATIBLE	(CPU_FTR_PPCAS_ARCH_V2)



#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E_64

#define CPU_FTRS_POSSIBLE	(CPU_FTRS_E6500 | CPU_FTRS_E5500)

#else

#ifdef CONFIG_CPU_LITTLE_ENDIAN
@@ -521,7 +521,7 @@ enum { 
#endif /* __powerpc64__ */



#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E_64

#define CPU_FTRS_ALWAYS		(CPU_FTRS_E6500 & CPU_FTRS_E5500)

#else

arch/powerpc/include/asm/interrupt.h

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static inline bool nmi_disables_ftrace(struct pt_regs *regs) 
		if (TRAP(regs) == INTERRUPT_PERFMON)

		       return false;

	}

	if (IS_ENABLED(CONFIG_PPC_BOOK3E)) {

	if (IS_ENABLED(CONFIG_PPC_BOOK3E_64)) {

		if (TRAP(regs) == INTERRUPT_PERFMON)

			return false;

	}

arch/powerpc/include/asm/nohash/pgalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ static inline void tlb_flush_pgtable(struct mmu_gather *tlb, 
{



}

#endif /* !CONFIG_PPC_BOOK3E */

#endif /* !CONFIG_PPC_BOOK3E_64 */



static inline pgd_t *pgd_alloc(struct mm_struct *mm)

{

arch/powerpc/include/asm/paca.h

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <asm/lppaca.h>

#include <asm/mmu.h>

#include <asm/page.h>

#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E_64

#include <asm/exception-64e.h>

#else

#include <asm/exception-64s.h>
@@ -127,7 +127,7 @@ struct paca_struct { 
#endif

#endif /* CONFIG_PPC_BOOK3S_64 */



#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E_64

	u64 exgen[8] __aligned(0x40);

	/* Keep pgd in the same cacheline as the start of extlb */

	pgd_t *pgd __aligned(0x40); /* Current PGD */
@@ -151,7 +151,7 @@ struct paca_struct { 
	void *dbg_kstack;



	struct tlb_core_data tcd;

#endif /* CONFIG_PPC_BOOK3E */

#endif /* CONFIG_PPC_BOOK3E_64 */



#ifdef CONFIG_PPC_64S_HASH_MMU

	unsigned char mm_ctx_low_slices_psize[BITS_PER_LONG / BITS_PER_BYTE];
@@ -168,7 +168,7 @@ struct paca_struct { 
#ifdef CONFIG_PPC64

	u64 exit_save_r1;		/* Syscall/interrupt R1 save */

#endif

#ifdef CONFIG_PPC_BOOK3E

#ifdef CONFIG_PPC_BOOK3E_64

	u16 trap_save;			/* Used when bad stack is encountered */

#endif

#ifdef CONFIG_PPC_BOOK3S_64