From: Sebastian Andrzej Siewior <bigeasy@breakpoint.cc>
Date: Sun, 26 Jul 2009 12:58:34 +0000 (+0200)
Subject: avr32/lib: fix unaligned memcpy where len < 4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=251ab1a37d9ba810593d5fbf2482bc4ba773fab2;p=linux-beck.git

avr32/lib: fix unaligned memcpy where len < 4

in case of memcpy(p, unaligned, 1..3) we get 1..3 as the
return value instead of p

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
---

diff --git a/arch/avr32/lib/memcpy.S b/arch/avr32/lib/memcpy.S
index 93e74b6fcdb6..c2ca49d705af 100644
--- a/arch/avr32/lib/memcpy.S
+++ b/arch/avr32/lib/memcpy.S
@@ -49,6 +49,7 @@ memcpy:
 
 	/* Handle unaligned "from" pointer */
 1:	sub	r10, 4
+	movlt	r9, r12
 	brlt	4b
 	add	r10, r9
 	lsl	r9, 2