diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 16:10:16 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-05 16:10:16 -0700 |
commit | 7e8767dddf3ad863a7013c334392e09177b48e2c (patch) | |
tree | 539597f8786439ee3e27819a5cd194da147fd7be /arch/arm/kernel/traps.c | |
parent | cab8e5c4444cb7d9b8035de5d81fbfd5284a02fa (diff) | |
parent | 082f47a79bfc8a526b9a3e14a0ae9504fc09cc12 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] always allow dump_stack() to produce a backtrace
[ARM] Fix non-page aligned boot time mappings
[ARM] 4458/1: pxa: Fix CKEN usage and hence fix pxa suspend/resume
[ARM] 4454/1: Use word accesses in Versatile PCI config reads
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r-- | arch/arm/kernel/traps.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 1b68d365d0e..237f4999b9a 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -181,9 +181,7 @@ static void dump_backtrace(struct pt_regs *regs, struct task_struct *tsk) void dump_stack(void) { -#ifdef CONFIG_DEBUG_ERRORS __backtrace(); -#endif } EXPORT_SYMBOL(dump_stack); |