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

powerpc: Remove CONFIG_PPC_FSL_BOOK3E 



CONFIG_PPC_FSL_BOOK3E is redundant with CONFIG_PPC_E500.

Remove it.

And rename five files accordingly.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Rename include guards to match new file names]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/795cb93b88c9a0279289712e674f39e3b108a1b4.1663606876.git.christophe.leroy@csgroup.eu
parent ec65560a

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ config PPC_LONG_DOUBLE_128 
config PPC_BARRIER_NOSPEC

	bool

	default y

	depends on PPC_BOOK3S_64 || PPC_FSL_BOOK3E

	depends on PPC_BOOK3S_64 || PPC_E500



config EARLY_PRINTK

	bool

arch/powerpc/include/asm/barrier.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ do { \ 


#ifdef CONFIG_PPC_BOOK3S_64

#define NOSPEC_BARRIER_SLOT   nop

#elif defined(CONFIG_PPC_FSL_BOOK3E)

#elif defined(CONFIG_PPC_E500)

#define NOSPEC_BARRIER_SLOT   nop; nop

#endif

arch/powerpc/include/asm/hugetlb.h

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 


#ifdef CONFIG_PPC_BOOK3S_64

#include <asm/book3s/64/hugetlb.h>

#elif defined(CONFIG_PPC_FSL_BOOK3E)

#include <asm/nohash/hugetlb-book3e.h>

#elif defined(CONFIG_PPC_E500)

#include <asm/nohash/hugetlb-e500.h>

#elif defined(CONFIG_PPC_8xx)

#include <asm/nohash/32/hugetlb-8xx.h>

#endif /* CONFIG_PPC_BOOK3S_64 */

arch/powerpc/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ struct kvmppc_passthru_irqmap { 
};

#endif



# ifdef CONFIG_PPC_FSL_BOOK3E

# ifdef CONFIG_PPC_E500

#define KVMPPC_BOOKE_IAC_NUM	2

#define KVMPPC_BOOKE_DAC_NUM	2

# else

arch/powerpc/include/asm/mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ 


typedef pte_t *pgtable_t;



#ifdef CONFIG_PPC_FSL_BOOK3E

#ifdef CONFIG_PPC_E500

#include <asm/percpu.h>

DECLARE_PER_CPU(int, next_tlbcam_idx);

#endif