powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before...
authorMichael Wolf <mjw@linux.vnet.ibm.com>
Fri, 5 Apr 2013 10:41:40 +0000 (10:41 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Thu, 25 Apr 2013 19:25:33 +0000 (20:25 +0100)
commit 9fb2640159f9d4f5a2a9d60e490482d4cbecafdb upstream.

Some versions of pHyp will perform the adjunct partition test before the
ANDCOND test.  The result of this is that H_RESOURCE can be returned and
cause the BUG_ON condition to occur. The HPTE is not removed.  So add a
check for H_RESOURCE, it is ok if this HPTE is not removed as
pSeries_lpar_hpte_remove is looking for an HPTE to remove and not a
specific HPTE to remove.  So it is ok to just move on to the next slot
and try again.

Signed-off-by: Michael Wolf <mjw@linux.vnet.ibm.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

No differences found