diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 00:16:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-17 00:16:14 +0200 |
| commit | 4fbca5320eb102d2e15bdeffe79e125c11cf925e (patch) | |
| tree | 59111c77d71bbdf557bbc30e31f5f3235ae0498c /arch/arm/lib/backtrace.S | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [ARM] arch/arm/kernel/dma-isa.c: named initializers (diff) | |
| download | linux-4fbca5320eb102d2e15bdeffe79e125c11cf925e.tar.xz linux-4fbca5320eb102d2e15bdeffe79e125c11cf925e.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] arch/arm/kernel/dma-isa.c: named initializers
[ARM] 3527/1: MPCore Boot Lockup Fix
[ARM] arch/arm/kernel/process.c: Fix warning
[ARM] 3526/1: ioremap should use vunmap instead of vfree on ARM
[ARM] 3524/1: ARM EABI: more 64-bit aligned stack fixes
[ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h
Diffstat (limited to 'arch/arm/lib/backtrace.S')
| -rw-r--r-- | arch/arm/lib/backtrace.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/backtrace.S b/arch/arm/lib/backtrace.S index 3bdc8c6949c5..16153c86c3f8 100644 --- a/arch/arm/lib/backtrace.S +++ b/arch/arm/lib/backtrace.S @@ -122,7 +122,7 @@ ENTRY(c_backtrace) #define reg r5 #define stack r6 -.Ldumpstm: stmfd sp!, {instr, reg, stack, r7, lr} +.Ldumpstm: stmfd sp!, {instr, reg, stack, r7, r8, lr} mov stack, r0 mov instr, r1 mov reg, #9 @@ -145,7 +145,7 @@ ENTRY(c_backtrace) adrne r0, .Lcr blne printk mov r0, stack - LOADREGS(fd, sp!, {instr, reg, stack, r7, pc}) + LOADREGS(fd, sp!, {instr, reg, stack, r7, r8, pc}) .Lfp: .asciz " r%d = %08X%c" .Lcr: .asciz "\n" |