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/Kconfig | |
| 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/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 752deddc9ed9..1e69cc299547 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -130,7 +130,7 @@ config PPC select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_MEMBARRIER_CALLBACKS select ARCH_HAS_SCALED_CPUTIME if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64 - select ARCH_HAS_STRICT_KERNEL_RWX if ((PPC_BOOK3S_64 || PPC32) && !HIBERNATION) + select ARCH_HAS_STRICT_KERNEL_RWX if (PPC32 && !HIBERNATION) select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UACCESS_FLUSHCACHE select ARCH_HAS_UACCESS_MCSAFE if PPC64 |