Module Name: src
Committed By: martin
Date: Tue Jan 28 16:45:25 UTC 2014
Modified Files:
src/sys/arch/arm/arm: cpufunc_asm_armv4.S
Log Message:
Replace the RET macro with mov pc,lr unconditionally - this is armv4
specific source.
Ok: matt@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/cpufunc_asm_armv4.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/cpufunc_asm_armv4.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_armv4.S:1.3 src/sys/arch/arm/arm/cpufunc_asm_armv4.S:1.4
--- src/sys/arch/arm/arm/cpufunc_asm_armv4.S:1.3 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/cpufunc_asm_armv4.S Tue Jan 28 16:45:25 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc_asm_armv4.S,v 1.3 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: cpufunc_asm_armv4.S,v 1.4 2014/01/28 16:45:25 martin Exp $ */
/*
* Copyright (c) 2001 ARM Limited
@@ -44,24 +44,24 @@
*/
ENTRY(armv4_tlb_flushID)
mcr p15, 0, r0, c8, c7, 0 /* flush I+D tlb */
- RET
+ mov pc, lr
END(armv4_tlb_flushID)
ENTRY(armv4_tlb_flushI)
mov r0, #0
mcr p15, 0, r0, c8, c5, 0 /* flush I tlb */
- RET
+ mov pc, lr
END(armv4_tlb_flushI)
ENTRY(armv4_tlb_flushD)
mov r0, #0
mcr p15, 0, r0, c8, c6, 0 /* flush D tlb */
- RET
+ mov pc, lr
END(armv4_tlb_flushD)
ENTRY(armv4_tlb_flushD_SE)
mcr p15, 0, r0, c8, c6, 1 /* flush D tlb single entry */
- RET
+ mov pc, lr
END(armv4_tlb_flushD_SE)
/*
@@ -69,5 +69,5 @@ END(armv4_tlb_flushD_SE)
*/
ENTRY(armv4_drain_writebuf)
mcr p15, 0, r0, c7, c10, 4 /* drain write buffer */
- RET
+ mov pc, lr
END(armv4_drain_writebuf)
