Commit 7ebc4903 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Michael Ellerman
Browse files

powerpc: Rename PPC_NATIVE to PPC_HASH_MMU_NATIVE 



PPC_NATIVE now only controls the native HPT code, so rename it to be
more descriptive. Restrict it to Book3S only.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211201144153.2456614-3-npiggin@gmail.com
parent 79b74a68

arch/powerpc/mm/book3s64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE) 


obj-y				+= hash_pgtable.o hash_utils.o slb.o \

				   mmu_context.o pgtable.o hash_tlb.o

obj-$(CONFIG_PPC_NATIVE)	+= hash_native.o

obj-$(CONFIG_PPC_HASH_MMU_NATIVE)	+= hash_native.o

obj-$(CONFIG_PPC_RADIX_MMU)	+= radix_pgtable.o radix_tlb.o

obj-$(CONFIG_PPC_4K_PAGES)	+= hash_4k.o

obj-$(CONFIG_PPC_64K_PAGES)	+= hash_64k.o

arch/powerpc/mm/book3s64/hash_utils.c

+1 −1
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ void __init hash__early_init_mmu(void) 
		ps3_early_mm_init();

	else if (firmware_has_feature(FW_FEATURE_LPAR))

		hpte_init_pseries();

	else if (IS_ENABLED(CONFIG_PPC_NATIVE))

	else if (IS_ENABLED(CONFIG_PPC_HASH_MMU_NATIVE))

		hpte_init_native();



	if (!mmu_hash_ops.hpte_insert)

arch/powerpc/platforms/52xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ config PPC_EFIKA 
	bool "bPlan Efika 5k2. MPC5200B based computer"

	depends on PPC_MPC52xx

	select PPC_RTAS

	select PPC_NATIVE

	select PPC_HASH_MMU_NATIVE



config PPC_LITE5200

	bool "Freescale Lite5200 Eval Board"

arch/powerpc/platforms/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ config EPAPR_PARAVIRT 


	  In case of doubt, say Y



config PPC_NATIVE

config PPC_HASH_MMU_NATIVE

	bool

	depends on PPC_BOOK3S_32 || PPC64

	depends on PPC_BOOK3S

	help

	  Support for running natively on the hardware, i.e. without

	  a hypervisor. This option is not user-selectable but should

arch/powerpc/platforms/cell/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ config PPC_CELL_COMMON 
	select PPC_DCR_MMIO

	select PPC_INDIRECT_PIO

	select PPC_INDIRECT_MMIO

	select PPC_NATIVE

	select PPC_HASH_MMU_NATIVE

	select PPC_RTAS

	select IRQ_EDGE_EOI_HANDLER