diff options
| author |   Jon Tollefson <kniht@linux.vnet.ibm.com> | 2007-05-18 04:49:22 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-06-14 22:29:55 +1000 |
| commit | 3f1df7a260aded4937e512872f3fbfdb9bc22c82 (patch) | |
| tree | 84c14dc59169426f9389ecf09818c8d21f592bca /arch/powerpc/mm | |
| parent | [POWERPC] Fix VDSO compile warning (diff) | |
| download | linux-dev-3f1df7a260aded4937e512872f3fbfdb9bc22c82.tar.xz linux-dev-3f1df7a260aded4937e512872f3fbfdb9bc22c82.zip | |
[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>
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/hash_native_64.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c index 4a20d890e2f4..bb76814c4a5b 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/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); |