[RFC:PATCH 06/06] powerpc: Don't clear _PAGE_COHERENT when _PAGE_SAO is set

[Dave Kleikamp]

On Wed, 2008-06-11 at 02:26 +0400, Sergei Shtylyov wrote:
> Hello.
> 
> Dave Kleikamp wrote:
> > powerpc: Don't clear _PAGE_COHERENT when _PAGE_SAO is set
> >
> > This is a placeholder.  Benh tells me that he will come up with a better fix.
> >
> > Signed-off-by: Dave Kleikamp <shaggy at linux.vnet.ibm.com>
> > ---
> >
> >  arch/powerpc/platforms/pseries/lpar.c |    3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff -Nurp linux005/arch/powerpc/platforms/pseries/lpar.c linux006/arch/powerpc/platforms/pseries/lpar.c
> > --- linux005/arch/powerpc/platforms/pseries/lpar.c	2008-06-05 10:07:34.000000000 -0500
> > +++ linux006/arch/powerpc/platforms/pseries/lpar.c	2008-06-10 16:48:59.000000000 -0500
> > @@ -305,7 +305,8 @@ static long pSeries_lpar_hpte_insert(uns
> >  	flags = 0;
> >  
> >  	/* Make pHyp happy */
> > -	if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
> > +	if ((rflags & _PAGE_GUARDED) ||
> > +	    ((rflags & _PAGE_NO_CACHE) & !(rflags & _PAGE_WRITETHRU)))
> >   
>    I don't think you really meant bitwise AND here. I suppose the second 
> expression just will never be true.

You're right.  That should be &&.  Thanks.

> WBR, Sergei
> 
> 
-- 
David Kleikamp
IBM Linux Technology Center