projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad92c61
)
powerpc/mm: Fix fallthrough bug in hpte_decode
author
Aneesh Kumar K.V
<
[email protected]
>
Wed, 3 Jul 2013 08:20:03 +0000
(13:50 +0530)
committer
Benjamin Herrenschmidt
<
[email protected]
>
Wed, 24 Jul 2013 04:42:21 +0000
(14:42 +1000)
We should not fallthrough different case statements in hpte_decode. Add
break statement to break out of the switch. The regression is introduced by
dcda287a9b26309ae43a091d0ecde16f8f61b4c0
"powerpc/mm: Simplify hpte_decode"
Reported-by: Paul Mackerras <
[email protected]
>
Signed-off-by: Aneesh Kumar K.V <
[email protected]
>
Signed-off-by: Benjamin Herrenschmidt <
[email protected]
>
arch/powerpc/mm/hash_native_64.c
patch
|
blob
|
history
diff --git
a/arch/powerpc/mm/hash_native_64.c
b/arch/powerpc/mm/hash_native_64.c
index 3f0c30ae4791db7597c3fac74740e09e0fb3b7c1..0530ff78c023fa2fcdfcf6ca6a45d4f34dba2840 100644
(file)
--- a/
arch/powerpc/mm/hash_native_64.c
+++ b/
arch/powerpc/mm/hash_native_64.c
@@
-554,6
+554,7
@@
static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
seg_off |= vpi << shift;
}
*vpn = vsid << (SID_SHIFT - VPN_SHIFT) | seg_off >> VPN_SHIFT;
+ break;
case MMU_SEGSIZE_1T:
/* We only have 40 - 23 bits of seg_off in avpn */
seg_off = (avpn & 0x1ffff) << 23;
@@
-563,6
+564,7
@@
static void hpte_decode(struct hash_pte *hpte, unsigned long slot,
seg_off |= vpi << shift;
}
*vpn = vsid << (SID_SHIFT_1T - VPN_SHIFT) | seg_off >> VPN_SHIFT;
+ break;
default:
*vpn = size = 0;
}