diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-08 01:45:47 -0400 |
| commit | 64e47488c913ac704d465a6af86a26786d1412a5 (patch) | |
| tree | d3b0148592963dcde26e4bb35ddfec8b1eaf8e23 /arch/x86_64/kernel/process.c | |
| parent | 4a35a46bf1cda4737c428380d1db5d15e2590d18 (diff) | |
| parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) | |
Merge linux-2.6 with linux-acpi-2.6
Diffstat (limited to 'arch/x86_64/kernel/process.c')
| -rw-r--r-- | arch/x86_64/kernel/process.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c index 7577f9d7a75d..8661f82ac70b 100644 --- a/arch/x86_64/kernel/process.c +++ b/arch/x86_64/kernel/process.c | |||
| @@ -310,6 +310,7 @@ void __show_regs(struct pt_regs * regs) | |||
| 310 | 310 | ||
| 311 | void show_regs(struct pt_regs *regs) | 311 | void show_regs(struct pt_regs *regs) |
| 312 | { | 312 | { |
| 313 | printk("CPU %d:", smp_processor_id()); | ||
| 313 | __show_regs(regs); | 314 | __show_regs(regs); |
| 314 | show_trace(®s->rsp); | 315 | show_trace(®s->rsp); |
| 315 | } | 316 | } |