forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ARM] 5381/1: unwind: Reorganise the traps.c code

Browse source 
This patch moves code around in the arch/arm/kernel/traps.c file for
easier integration of the stack unwinding support.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Catalin Marinas 2009-02-11 13:06:53 +01:00 • committed by Russell King
commit 67a94c23bb
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/include/asm/traps.h
View file

@ -25,5 +25,6 @@ static inline int in_exception_text(unsigned long ptr)
} }
extern void __init early_trap_init(void); extern void __init early_trap_init(void);
extern void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame);
#endif #endif

32
arch/arm/kernel/traps.c
View file

@ -152,11 +152,25 @@ static void dump_instr(struct pt_regs *regs)
static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
{ {
unsigned int fp; unsigned int fp, mode;
int ok = 1; int ok = 1;
printk("Backtrace: "); printk("Backtrace: ");
if (!tsk)
tsk = current;
if (regs) {
fp = regs->ARM_fp; fp = regs->ARM_fp;
mode = processor_mode(regs);
} else if (tsk != current) {
fp = thread_saved_fp(tsk);
mode = 0x10;
} else {
asm("mov %0, fp" : "=r" (fp) : : "cc");
mode = 0x10;
}
if (!fp) { if (!fp) {
printk("no frame pointer"); printk("no frame pointer");
ok = 0; ok = 0;
@ -168,29 +182,19 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk)
printk("\n"); printk("\n");
if (ok) if (ok)
c_backtrace(fp, processor_mode(regs)); c_backtrace(fp, mode);
} }
void dump_stack(void) void dump_stack(void)
{ {
__backtrace(); dump_backtrace(NULL, NULL);
} }
EXPORT_SYMBOL(dump_stack); EXPORT_SYMBOL(dump_stack);
void show_stack(struct task_struct *tsk, unsigned long *sp) void show_stack(struct task_struct *tsk, unsigned long *sp)
{ {
unsigned long fp; dump_backtrace(NULL, tsk);
if (!tsk)
tsk = current;
if (tsk != current)
fp = thread_saved_fp(tsk);
else
asm("mov %0, fp" : "=r" (fp) : : "cc");
c_backtrace(fp, 0x10);
barrier(); barrier();
} }