powerpc/mm: Don't clear _PAGE_COHERENT when _PAGE_SAO is set
commit801eb73f45371accc78ca9d6d22d647eeb722c11
authorDave Kleikamp <shaggy@linux.vnet.ibm.com>
Mon, 7 Jul 2008 14:28:55 +0000 (8 00:28 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Jul 2008 06:30:46 +0000 (9 16:30 +1000)
tree4bd392fcae5b158551afdebb57f9fc353bf890c4
parentef3d3246a0d06be622867d21af25f997aeeb105f
powerpc/mm: Don't clear _PAGE_COHERENT when _PAGE_SAO is set

The current low level hash code on LPAR configurations clears
_PAGE_COHERENT (M) when either _PAGE_GUARDED (G) or _PAGE_NO_CACHE (I)
is set. This conflicts with _PAGE_SAO which has M, I and W bits sets at
once (normally invalid combo) to indicate the new SAO attribute.

This changes the code to allow that case.

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/pseries/lpar.c