* [PATCH] sh: 16-bit get_unaligned() sh4a fix
@ 2009-06-04 9:44 Magnus Damm
0 siblings, 0 replies; only message in thread
From: Magnus Damm @ 2009-06-04 9:44 UTC (permalink / raw)
To: linux-sh
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(-)
--- 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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-06-04 9:44 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-04 9:44 [PATCH] sh: 16-bit get_unaligned() sh4a fix Magnus Damm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox