diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-05 08:27:42 -0400 |
| commit | cf57a308436653f3094590202c77459aab250ff3 (patch) | |
| tree | 8a9e7096e494141911147a1f24865c3d79d583c1 /arch/x86_64/kernel/process.c | |
| parent | faac9bd0e3ce7cb0572ec66e0a426cacf6afa970 (diff) | |
| parent | ca78f6baca863afe2e6a244a0fe94b3a70211d46 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/x86_64/kernel/process.c')
| -rw-r--r-- | arch/x86_64/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c index ca56e19b8b6e..bb6745d13b8f 100644 --- a/arch/x86_64/kernel/process.c +++ b/arch/x86_64/kernel/process.c | |||
| @@ -296,7 +296,7 @@ void __show_regs(struct pt_regs * regs) | |||
| 296 | system_utsname.version); | 296 | system_utsname.version); |
| 297 | printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip); | 297 | printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip); |
| 298 | printk_address(regs->rip); | 298 | printk_address(regs->rip); |
| 299 | printk("\nRSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->rsp, | 299 | printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->rsp, |
| 300 | regs->eflags); | 300 | regs->eflags); |
| 301 | printk("RAX: %016lx RBX: %016lx RCX: %016lx\n", | 301 | printk("RAX: %016lx RBX: %016lx RCX: %016lx\n", |
| 302 | regs->rax, regs->rbx, regs->rcx); | 302 | regs->rax, regs->rbx, regs->rcx); |