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)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 Apr 2013 05:19:09 +0000 (15:19 +1000)
commit9fb2640159f9d4f5a2a9d60e490482d4cbecafdb
tree998b11ffa8907dd592f5f9b1156fd9301019ec82
parent875b7679abbb232b584f2eec59fa6e45690dd6c4
powerpc: pSeries_lpar_hpte_remove fails from Adjunct partition being performed before the ANDCOND test

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.

Cc: stable@vger.kernel.org
Signed-off-by: Michael Wolf <mjw@linux.vnet.ibm.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
arch/powerpc/platforms/pseries/lpar.c