OSDN Git Service

Revert "powerpc/32s: reorder Linux PTE bits to better match Hash PTE bits."
authorChristophe Leroy <christophe.leroy@csgroup.eu>
Wed, 20 May 2020 10:23:45 +0000 (10:23 +0000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 20 May 2020 12:35:52 +0000 (22:35 +1000)
commit40bb0e904212cf7d6f041a98c58c8341b2016670
tree84f39dab91463e841a6292a2329de436595415f3
parent249c9b0cd193d983c3a0b00f3fd3b92333bfeebe
Revert "powerpc/32s: reorder Linux PTE bits to better match Hash PTE bits."

This reverts commit 697ece78f8f749aeea40f2711389901f0974017a.

The implementation of SWAP on powerpc requires page protection
bits to not be one of the least significant PTE bits.

Until the SWAP implementation is changed and this requirement voids,
we have to keep at least _PAGE_RW outside of the 3 last bits.

For now, revert to previous PTE bits order. A further rework
may come later.

Fixes: 697ece78f8f7 ("powerpc/32s: reorder Linux PTE bits to better match Hash PTE bits.")
Reported-by: Rui Salvaterra <rsalvaterra@gmail.com>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b34706f8de87f84d135abb5f3ede6b6f16fb1f41.1589969799.git.christophe.leroy@csgroup.eu
arch/powerpc/include/asm/book3s/32/hash.h
arch/powerpc/kernel/head_32.S
arch/powerpc/mm/book3s32/hash_low.S