aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-01-30 07:33:08 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:08 -0500
commitaafbd7eb2057edfc9a17b258e3f0258a4e6d8198 (patch)
treee71499d62651d2a4e7dec958ab749e7a729eb20f /arch/x86
parenta25bd94964e87b1b93903a822fba5025d995d4da (diff)
x86: make printk_address regs->ip always reliable
printk_address()'s second parameter is the reliability indication, not the ebp. If we're printing regs->ip we're reliable by definition, so pass a 1 here. Signed-off-by: Arjan van de Ven Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/process_64.c2
-rw-r--r--arch/x86/kernel/traps_64.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 383760bfd283..4e65ae8a54bf 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -329,7 +329,7 @@ void __show_regs(struct pt_regs * regs)
329 (int)strcspn(init_utsname()->version, " "), 329 (int)strcspn(init_utsname()->version, " "),
330 init_utsname()->version); 330 init_utsname()->version);
331 printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); 331 printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip);
332 printk_address(regs->ip, regs->bp); 332 printk_address(regs->ip, 1);
333 printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->sp, 333 printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->sp,
334 regs->flags); 334 regs->flags);
335 printk("RAX: %016lx RBX: %016lx RCX: %016lx\n", 335 printk("RAX: %016lx RBX: %016lx RCX: %016lx\n",
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 0bba7924604e..814801f4eb9e 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -582,7 +582,7 @@ int __kprobes __die(const char * str, struct pt_regs * regs, long err)
582 add_taint(TAINT_DIE); 582 add_taint(TAINT_DIE);
583 /* Executive summary in case the oops scrolled away */ 583 /* Executive summary in case the oops scrolled away */
584 printk(KERN_ALERT "RIP "); 584 printk(KERN_ALERT "RIP ");
585 printk_address(regs->ip, regs->bp); 585 printk_address(regs->ip, 1);
586 printk(" RSP <%016lx>\n", regs->sp); 586 printk(" RSP <%016lx>\n", regs->sp);
587 if (kexec_should_crash(current)) 587 if (kexec_should_crash(current))
588 crash_kexec(regs); 588 crash_kexec(regs);