All platforms now have KUAP so remove CONFIG_PPC_HAVE_KUAP
Signed-off-by: Christophe Leroy <christophe.le...@csgroup.eu>
---
arch/powerpc/mm/nohash/kup.c | 1 -
arch/powerpc/platforms/Kconfig.cputype | 11 -----------
2 files changed, 12 deletions(-)
diff --git a/arch/powerpc/mm/nohash/kup.c b/arch/powerpc/mm/nohash/kup.c
index bbacbd780806..eaea52231dd6 100644
--- a/arch/powerpc/mm/nohash/kup.c
+++ b/arch/powerpc/mm/nohash/kup.c
@@ -10,7 +10,6 @@
#include <linux/smp.h>
#include <asm/kup.h>
-#include <asm/mmu.h>
#include <asm/smp.h>
#ifdef CONFIG_PPC_KUAP
diff --git a/arch/powerpc/platforms/Kconfig.cputype
b/arch/powerpc/platforms/Kconfig.cputype
index d0e52ad45d73..d0ae0d6a1384 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -31,20 +31,17 @@ config PPC_BOOK3S_32
imply PPC_FPU
select PPC_HAVE_PMU_SUPPORT
select PPC_HAVE_KUEP
- select PPC_HAVE_KUAP
select HAVE_ARCH_VMAP_STACK
config PPC_85xx
bool "Freescale 85xx"
select E500
- select PPC_HAVE_KUAP
config PPC_8xx
bool "Freescale 8xx"
select ARCH_SUPPORTS_HUGETLBFS
select FSL_SOC
select PPC_HAVE_KUEP
- select PPC_HAVE_KUAP
select HAVE_ARCH_VMAP_STACK
select HUGETLBFS
@@ -54,7 +51,6 @@ config 40x
select PPC_UDBG_16550
select 4xx_SOC
select HAVE_PCI
- select PPC_HAVE_KUAP
config 44x
bool "AMCC 44x, 46x or 47x"
@@ -64,7 +60,6 @@ config 44x
select HAVE_PCI
select PHYS_64BIT
select PPC_HAVE_KUEP
- select PPC_HAVE_KUAP
endchoice
@@ -110,7 +105,6 @@ config PPC_BOOK3S_64
select IRQ_WORK
select PPC_MM_SLICES
select PPC_HAVE_KUEP
- select PPC_HAVE_KUAP
config PPC_BOOK3E_64
bool "Embedded processors"
@@ -118,7 +112,6 @@ config PPC_BOOK3E_64
select PPC_SMP_MUXED_IPI
select PPC_DOORBELL
select ZONE_DMA
- select PPC_HAVE_KUAP
endchoice
@@ -408,12 +401,8 @@ config PPC_KUEP
If you're unsure, say Y.
-config PPC_HAVE_KUAP
- bool
-
config PPC_KUAP
bool "Kernel Userspace Access Protection"
- depends on PPC_HAVE_KUAP
default y
help
Enable support for Kernel Userspace Access Protection (KUAP)
--
2.31.1
