diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:33:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 18:33:27 -0500 |
commit | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (patch) | |
tree | 4da7e3b3c0213317dd17c6535876171865e24315 /arch/x86/kernel/process_32.c | |
parent | 83be7d764dc4b860712e392197ec27645f9d74a8 (diff) | |
parent | 9b3660a55a9052518c91cc7c62d89e22f3f6f490 (diff) |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: Limit number of per cpu TSC sync messages
x86: dumpstack, 64-bit: Disable preemption when walking the IRQ/exception stacks
x86: dumpstack: Clean up the x86_stack_ids[][] initalization and other details
x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes
x86: Suppress stack overrun message for init_task
x86: Fix cpu_devs[] initialization in early_cpu_init()
x86: Remove CPU cache size output for non-Intel too
x86: Minimise printk spew from per-vendor init code
x86: Remove the CPU cache size printk's
cpumask: Avoid cpumask_t in arch/x86/kernel/apic/nmi.c
x86: Make sure we also print a Code: line for show_regs()
Diffstat (limited to 'arch/x86/kernel/process_32.c')
-rw-r--r-- | arch/x86/kernel/process_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 540140284f60..075580b35682 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -188,7 +188,7 @@ void __show_regs(struct pt_regs *regs, int all) | |||
188 | 188 | ||
189 | void show_regs(struct pt_regs *regs) | 189 | void show_regs(struct pt_regs *regs) |
190 | { | 190 | { |
191 | __show_regs(regs, 1); | 191 | show_registers(regs); |
192 | show_trace(NULL, regs, ®s->sp, regs->bp); | 192 | show_trace(NULL, regs, ®s->sp, regs->bp); |
193 | } | 193 | } |
194 | 194 | ||