Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / arm / lib / delay.S

diff --git a/arch/arm/lib/delay.S b/arch/arm/lib/delay.S
index 930a702..9183b06 100644 (file)
--- a/arch/arm/lib/delay.S
+++ b/arch/arm/lib/delay.S
@@ -31,7 +31,7 @@ ENTRY(__const_udelay)                         @ 0 <= r0 <= 0x7fffff06
                mov     r2, r2, lsr #10         @ max = 0x00007fff
                mul     r0, r2, r0              @ max = 2^32-1
                movs    r0, r0, lsr #6
-               moveq   pc, lr
+               RETINSTR(moveq,pc,lr)
 
 /*
  * loops = r0 * HZ * loops_per_jiffy / 1000000
@@ -43,20 +43,20 @@ ENTRY(__const_udelay)                               @ 0 <= r0 <= 0x7fffff06
 ENTRY(__delay)
                subs    r0, r0, #1
 #if 0
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
-               movls   pc, lr
+               RETINSTR(movls,pc,lr)
                subs    r0, r0, #1
 #endif
                bhi     __delay
-               mov     pc, lr
+               RETINSTR(mov,pc,lr)