summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/memzero.S
diff options
context:
space:
mode:
authorRussell King2006-06-25 12:17:23 +0200
committerRussell King2006-06-25 12:17:23 +0200
commit7999d8d7a611bee902446939952859caf1367c25 (patch)
tree98dd4b81951f25b60012f2d91203fab3e0fd9010 /arch/arm/lib/memzero.S
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
downloadkernel-qcow2-linux-7999d8d7a611bee902446939952859caf1367c25.tar.gz
kernel-qcow2-linux-7999d8d7a611bee902446939952859caf1367c25.tar.xz
kernel-qcow2-linux-7999d8d7a611bee902446939952859caf1367c25.zip
[ARM] Remove RETINSTR macro
RETINSTR is a left-over from the days when we had 26-bit and 32-bit CPU support integrated into the same tree. Since this is no longer the case, we can now remove RETINSTR. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib/memzero.S')
-rw-r--r--arch/arm/lib/memzero.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/memzero.S b/arch/arm/lib/memzero.S
index 51ccc60160fd..764e7de8bbab 100644
--- a/arch/arm/lib/memzero.S
+++ b/arch/arm/lib/memzero.S
@@ -77,4 +77,4 @@ ENTRY(__memzero)
strneb r2, [r0], #1 @ 1
tst r1, #1 @ 1 a byte left over
strneb r2, [r0], #1 @ 1
- RETINSTR(mov,pc,lr) @ 1
+ mov pc, lr @ 1