From 7762fc7fdb9f40536be588c4f0f8d6a9973dbf0e Mon Sep 17 00:00:00 2001 From: Jon Tollefson Date: Fri, 18 May 2007 04:49:22 +1000 Subject: [PATCH] --- yaml --- r: 60503 b: refs/heads/master c: 3f1df7a260aded4937e512872f3fbfdb9bc22c82 h: refs/heads/master i: 60501: 75b1ef995eca0f4a5539457d4f8dc55f6f2be579 60499: 5c450bff16a0ec20ed6bcd4366f5626a003dfd8a 60495: b6b42a2cc7ecb5ddc5e9f2ef2f205b3b39e7b5a3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/hash_native_64.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f593e6bc6872..41f59e81a819 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 31fe5bf66a09c36e95b4c04291249b251b52f2d4 +refs/heads/master: 3f1df7a260aded4937e512872f3fbfdb9bc22c82 diff --git a/trunk/arch/powerpc/mm/hash_native_64.c b/trunk/arch/powerpc/mm/hash_native_64.c index 4a20d890e2f4..bb76814c4a5b 100644 --- a/trunk/arch/powerpc/mm/hash_native_64.c +++ b/trunk/arch/powerpc/mm/hash_native_64.c @@ -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 */ if (!HPTE_V_COMPARE(hpte_v, want_v) || !(hpte_v & HPTE_V_VALID)) { DBG_LOW(" -> miss\n"); - native_unlock_hpte(hptep); ret = -1; } else { DBG_LOW(" -> hit\n"); /* Update the HPTE */ hptep->r = (hptep->r & ~(HPTE_R_PP | HPTE_R_N)) | (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. */ tlbie(va, psize, local);