[POWERPC] Move common code out of if/else
Move common code out of if/else. Signed-off-by: Jon Tollefson <kniht@linux.vnet.ibm.com> ---- hash_native_64.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
committed by
Paul Mackerras
parent
31fe5bf66a
commit
3f1df7a260
@@ -233,15 +233,14 @@ static long native_hpte_updatepp(unsigned long slot, unsigned long newpp,
|
|||||||
/* Even if we miss, we need to invalidate the TLB */
|
/* Even if we miss, we need to invalidate the TLB */
|
||||||
if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) {
|
if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) {
|
||||||
DBG_LOW(" -> miss\n");
|
DBG_LOW(" -> miss\n");
|
||||||
native_unlock_hpte(hptep);
|
|
||||||
ret = -1;
|
ret = -1;
|
||||||
} else {
|
} else {
|
||||||
DBG_LOW(" -> hit\n");
|
DBG_LOW(" -> hit\n");
|
||||||
/* Update the HPTE */
|
/* Update the HPTE */
|
||||||
hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) |
|
hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) |
|
||||||
(newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C));
|
(newpp & (HPTE_R_PP | HPTE_R_N | HPTE_R_C));
|
||||||
native_unlock_hpte(hptep);
|
|
||||||
}
|
}
|
||||||
|
native_unlock_hpte(hptep);
|
||||||
|
|
||||||
/* Ensure it is out of the tlb too. */
|
/* Ensure it is out of the tlb too. */
|
||||||
tlbie(va, psize, local);
|
tlbie(va, psize, local);
|
||||||
|
Reference in New Issue
Block a user