diff mbox

sh: 16-bit get_unaligned() sh4a fix

Message ID 20090604094455.6479.7665.sendpatchset@rx1.opensource.se (mailing list archive)
State Accepted
Headers show

Commit Message

Magnus Damm June 4, 2009, 9:44 a.m. UTC 
From: Magnus Damm <damm@igel.co.jp>

This patch fixes the 16-bit case of the sh4a specific
unaligned access implementation. Without this patch
the 16-bit version of sh4a get_unaligned() results in
a 32-bit read which may read more data than intended
and/or cross page boundaries.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 Unbreaks mtd NOR write handling on Migo-R.

 arch/sh/include/asm/unaligned-sh4a.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- 0001/arch/sh/include/asm/unaligned-sh4a.h
+++ work/arch/sh/include/asm/unaligned-sh4a.h	2009-06-04 18:36:15.000000000 +0900
@@ -41,9 +41,9 @@  struct __una_u64 { u64 x __attribute__((
 static inline u16 __get_unaligned_cpu16(const u8 *p)
 {
 #ifdef __LITTLE_ENDIAN
-	return __get_unaligned_cpu32(p) & 0xffff;
+	return p[0] | (p[1] << 8);
 #else
-	return __get_unaligned_cpu32(p) >> 16;
+	return (p[0] << 8) | p[1];
 #endif
 }