diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-26 15:56:03 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-05-26 15:56:03 +0300 |
| commit | baddc87d6824cda18037881352fe97382fdb0867 (patch) | |
| tree | 7f10a8c28df8136841cae359ded4c321cb1a81ad /arch/powerpc/platforms | |
| parent | bb5f33c069402035a3d6a2091ee68cac6999d774 (diff) | |
| parent | 595d153dd1022392083ac93a1550382cbee127e0 (diff) | |
| download | linux-baddc87d6824cda18037881352fe97382fdb0867.tar.xz | |
Merge branch 'fixes' into next
Merge our fixes branch from this cycle. It contains several important
fixes we need in next for testing purposes, and also some that will
conflict with upcoming changes.
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/Kconfig.cputype | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 404f26917da7..e3fb0ef5129f 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype @@ -397,7 +397,7 @@ config PPC_KUAP config PPC_KUAP_DEBUG bool "Extra debugging for Kernel Userspace Access Protection" - depends on PPC_KUAP && (PPC_RADIX_MMU || PPC_32) + depends on PPC_KUAP && (PPC_RADIX_MMU || PPC32) help Add extra debugging for Kernel Userspace Access Protection (KUAP) If you're unsure, say N. |