diff options
| author | Christophe Leroy <christophe.leroy@c-s.fr> | 2017-07-12 13:08:53 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2017-08-15 15:55:54 +0300 |
| commit | 87be3e2d31c01d3858bff43ab663769db03aab17 (patch) | |
| tree | c38b273270b0c31a8849d9bd41f48012fe74d52f /arch/powerpc | |
| parent | a3059b0ca00bc3656ec47797e5816eeedaac3426 (diff) | |
| download | linux-87be3e2d31c01d3858bff43ab663769db03aab17.tar.xz | |
powerpc/8xx: Do not allow Pinned TLBs with STRICT_KERNEL_RWX or DEBUG_PAGEALLOC
Pinning TLBs bypasses STRICT_KERNEL_RWX or DEBUG_PAGEALLOC protections
so it should only be allowed when those are not selected
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a4c575c95937..a2b669729440 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -1176,7 +1176,8 @@ config CONSISTENT_SIZE config PIN_TLB bool "Pinned Kernel TLBs (860 ONLY)" - depends on ADVANCED_OPTIONS && PPC_8xx + depends on ADVANCED_OPTIONS && PPC_8xx && \ + !DEBUG_PAGEALLOC && !STRICT_KERNEL_RWX config PIN_TLB_DATA bool "Pinned TLB for DATA" |