* [PATCH] powerpc: move common code out of if/else
@ 2007-05-16 18:42 Jon Tollefson
2007-05-17 18:49 ` Jon Tollefson
0 siblings, 1 reply; 2+ messages in thread
From: Jon Tollefson @ 2007-05-16 18:42 UTC (permalink / raw)
To: linuxppc-dev
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(-)
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 4a20d89..bb76814 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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] powerpc: move common code out of if/else
2007-05-16 18:42 [PATCH] powerpc: move common code out of if/else Jon Tollefson
@ 2007-05-17 18:49 ` Jon Tollefson
0 siblings, 0 replies; 2+ messages in thread
From: Jon Tollefson @ 2007-05-17 18:49 UTC (permalink / raw)
To: linuxppc-dev
Resubmitting with white space damage repaired.
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(-)
diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c
index 4a20d89..bb76814 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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-05-17 18:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-16 18:42 [PATCH] powerpc: move common code out of if/else Jon Tollefson
2007-05-17 18:49 ` Jon Tollefson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).