Skip to content

Commit

Permalink
powerpc/8xx: Do not allow Pinned TLBs with STRICT_KERNEL_RWX or DEBUG…
Browse files Browse the repository at this point in the history 
…_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>
  • Loading branch information
Christophe Leroy authored and Michael Ellerman committed Aug 15, 2017
1 parent a3059b0 commit 87be3e2
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/powerpc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 87be3e2

Please sign in to comment.