From: Arjan van de Ven Date: Wed, 30 Jan 2008 12:33:08 +0000 (+0100) Subject: x86: make printk_address regs->ip always reliable X-Git-Tag: v2.6.25-rc1~1143^2~309 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aafbd7eb2057edfc9a17b258e3f0258a4e6d8198;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 383760bfd28..4e65ae8a54b 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) (int)strcspn(init_utsname()->version, " "), init_utsname()->version); printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->ip); - printk_address(regs->ip, regs->bp); + printk_address(regs->ip, 1); printk("RSP: %04lx:%016lx EFLAGS: %08lx\n", regs->ss, regs->sp, regs->flags); 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 0bba7924604..814801f4eb9 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) add_taint(TAINT_DIE); /* Executive summary in case the oops scrolled away */ printk(KERN_ALERT "RIP "); - printk_address(regs->ip, regs->bp); + printk_address(regs->ip, 1); printk(" RSP <%016lx>\n", regs->sp); if (kexec_should_crash(current)) crash_kexec(regs);