Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20211201144153.2456614-3-npiggin@gmail.com

authored by

Nicholas Piggin and committed by
Michael Ellerman
7ebc4903 79b74a68

+14 -14
+1 -1
arch/powerpc/mm/book3s64/Makefile
··· 6 6 7 7 obj-y += hash_pgtable.o hash_utils.o slb.o \ 8 8 mmu_context.o pgtable.o hash_tlb.o 9 - obj-$(CONFIG_PPC_NATIVE) += hash_native.o 9 + obj-$(CONFIG_PPC_HASH_MMU_NATIVE) += hash_native.o 10 10 obj-$(CONFIG_PPC_RADIX_MMU) += radix_pgtable.o radix_tlb.o 11 11 obj-$(CONFIG_PPC_4K_PAGES) += hash_4k.o 12 12 obj-$(CONFIG_PPC_64K_PAGES) += hash_64k.o
+1 -1
arch/powerpc/mm/book3s64/hash_utils.c
··· 1091 1091 ps3_early_mm_init(); 1092 1092 else if (firmware_has_feature(FW_FEATURE_LPAR)) 1093 1093 hpte_init_pseries(); 1094 - else if (IS_ENABLED(CONFIG_PPC_NATIVE)) 1094 + else if (IS_ENABLED(CONFIG_PPC_HASH_MMU_NATIVE)) 1095 1095 hpte_init_native(); 1096 1096 1097 1097 if (!mmu_hash_ops.hpte_insert)
+1 -1
arch/powerpc/platforms/52xx/Kconfig
··· 34 34 bool "bPlan Efika 5k2. MPC5200B based computer" 35 35 depends on PPC_MPC52xx 36 36 select PPC_RTAS 37 - select PPC_NATIVE 37 + select PPC_HASH_MMU_NATIVE 38 38 39 39 config PPC_LITE5200 40 40 bool "Freescale Lite5200 Eval Board"
+2 -2
arch/powerpc/platforms/Kconfig
··· 40 40 41 41 In case of doubt, say Y 42 42 43 - config PPC_NATIVE 43 + config PPC_HASH_MMU_NATIVE 44 44 bool 45 - depends on PPC_BOOK3S_32 || PPC64 45 + depends on PPC_BOOK3S 46 46 help 47 47 Support for running natively on the hardware, i.e. without 48 48 a hypervisor. This option is not user-selectable but should
+1 -1
arch/powerpc/platforms/cell/Kconfig
··· 8 8 select PPC_DCR_MMIO 9 9 select PPC_INDIRECT_PIO 10 10 select PPC_INDIRECT_MMIO 11 - select PPC_NATIVE 11 + select PPC_HASH_MMU_NATIVE 12 12 select PPC_RTAS 13 13 select IRQ_EDGE_EOI_HANDLER 14 14
+1 -1
arch/powerpc/platforms/chrp/Kconfig
··· 11 11 select RTAS_ERROR_LOGGING 12 12 select PPC_MPC106 13 13 select PPC_UDBG_16550 14 - select PPC_NATIVE 14 + select PPC_HASH_MMU_NATIVE 15 15 select FORCE_PCI 16 16 default y
+1 -1
arch/powerpc/platforms/embedded6xx/Kconfig
··· 55 55 select FORCE_PCI 56 56 select PPC_INDIRECT_PCI 57 57 select PPC_I8259 58 - select PPC_NATIVE 58 + select PPC_HASH_MMU_NATIVE 59 59 select PPC_UDBG_16550 60 60 help 61 61 This option enables support for the Motorola (now Emerson) MVME5100
+1 -1
arch/powerpc/platforms/maple/Kconfig
··· 9 9 select GENERIC_TBSYNC 10 10 select PPC_UDBG_16550 11 11 select PPC_970_NAP 12 - select PPC_NATIVE 12 + select PPC_HASH_MMU_NATIVE 13 13 select PPC_RTAS 14 14 select MMIO_NVRAM 15 15 select ATA_NONSTANDARD if ATA
+1 -1
arch/powerpc/platforms/microwatt/Kconfig
··· 5 5 select PPC_XICS 6 6 select PPC_ICS_NATIVE 7 7 select PPC_ICP_NATIVE 8 - select PPC_NATIVE 8 + select PPC_HASH_MMU_NATIVE 9 9 select PPC_UDBG_16550 10 10 select ARCH_RANDOM 11 11 help
+1 -1
arch/powerpc/platforms/pasemi/Kconfig
··· 5 5 select MPIC 6 6 select FORCE_PCI 7 7 select PPC_UDBG_16550 8 - select PPC_NATIVE 8 + select PPC_HASH_MMU_NATIVE 9 9 select MPIC_BROKEN_REGREAD 10 10 help 11 11 This option enables support for PA Semi's PWRficient line
+1 -1
arch/powerpc/platforms/powermac/Kconfig
··· 6 6 select FORCE_PCI 7 7 select PPC_INDIRECT_PCI if PPC32 8 8 select PPC_MPC106 if PPC32 9 - select PPC_NATIVE 9 + select PPC_HASH_MMU_NATIVE 10 10 select ZONE_DMA if PPC32 11 11 default y 12 12
+1 -1
arch/powerpc/platforms/powernv/Kconfig
··· 2 2 config PPC_POWERNV 3 3 depends on PPC64 && PPC_BOOK3S 4 4 bool "IBM PowerNV (Non-Virtualized) platform support" 5 - select PPC_NATIVE 5 + select PPC_HASH_MMU_NATIVE 6 6 select PPC_XICS 7 7 select PPC_ICP_NATIVE 8 8 select PPC_XIVE_NATIVE
+1 -1
arch/powerpc/platforms/pseries/Kconfig
··· 17 17 select PPC_RTAS_DAEMON 18 18 select RTAS_ERROR_LOGGING 19 19 select PPC_UDBG_16550 20 - select PPC_NATIVE 20 + select PPC_HASH_MMU_NATIVE 21 21 select PPC_DOORBELL 22 22 select HOTPLUG_CPU 23 23 select ARCH_RANDOM