diff options
Diffstat (limited to 'arch/arm/lib/backtrace.S')
-rw-r--r-- | arch/arm/lib/backtrace.S | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S index 16153c86c3f..91f993f2e9d 100644 --- a/arch/arm/lib/backtrace.S +++ b/arch/arm/lib/backtrace.S | |||
@@ -41,7 +41,7 @@ ENTRY(c_backtrace) | |||
41 | movne r0, #0 | 41 | movne r0, #0 |
42 | movs frame, r0 | 42 | movs frame, r0 |
43 | 1: moveq r0, #-2 | 43 | 1: moveq r0, #-2 |
44 | LOADREGS(eqfd, sp!, {r4 - r8, pc}) | 44 | ldmeqfd sp!, {r4 - r8, pc} |
45 | 45 | ||
46 | 2: stmfd sp!, {pc} @ calculate offset of PC in STMIA instruction | 46 | 2: stmfd sp!, {pc} @ calculate offset of PC in STMIA instruction |
47 | ldr r0, [sp], #4 | 47 | ldr r0, [sp], #4 |
@@ -85,7 +85,7 @@ ENTRY(c_backtrace) | |||
85 | * A zero next framepointer means we're done. | 85 | * A zero next framepointer means we're done. |
86 | */ | 86 | */ |
87 | teq next, #0 | 87 | teq next, #0 |
88 | LOADREGS(eqfd, sp!, {r4 - r8, pc}) | 88 | ldmeqfd sp!, {r4 - r8, pc} |
89 | 89 | ||
90 | /* | 90 | /* |
91 | * The next framepointer must be above the | 91 | * The next framepointer must be above the |
@@ -97,16 +97,13 @@ ENTRY(c_backtrace) | |||
97 | b 1007f | 97 | b 1007f |
98 | 98 | ||
99 | /* | 99 | /* |
100 | * Fixup for LDMDB | 100 | * Fixup for LDMDB. Note that this must not be in the fixup section. |
101 | */ | 101 | */ |
102 | .section .fixup,"ax" | ||
103 | .align 0 | ||
104 | 1007: ldr r0, =.Lbad | 102 | 1007: ldr r0, =.Lbad |
105 | mov r1, frame | 103 | mov r1, frame |
106 | bl printk | 104 | bl printk |
107 | LOADREGS(fd, sp!, {r4 - r8, pc}) | 105 | ldmfd sp!, {r4 - r8, pc} |
108 | .ltorg | 106 | .ltorg |
109 | .previous | ||
110 | 107 | ||
111 | .section __ex_table,"a" | 108 | .section __ex_table,"a" |
112 | .align 3 | 109 | .align 3 |
@@ -145,7 +142,7 @@ ENTRY(c_backtrace) | |||
145 | adrne r0, .Lcr | 142 | adrne r0, .Lcr |
146 | blne printk | 143 | blne printk |
147 | mov r0, stack | 144 | mov r0, stack |
148 | LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc}) | 145 | ldmfd sp!, {instr, reg, stack, r7, r8, pc} |
149 | 146 | ||
150 | .Lfp: .asciz " r%d = %08X%c" | 147 | .Lfp: .asciz " r%d = %08X%c" |
151 | .Lcr: .asciz "\n" | 148 | .Lcr: .asciz "\n" |