From 7ce21f28203b7a0f9f8249dda7d2402944aa8d72 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Wed, 30 Jan 2008 13:33:08 +0100 Subject: [PATCH] --- yaml --- r: 80266 b: refs/heads/master c: aafbd7eb2057edfc9a17b258e3f0258a4e6d8198 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/process_64.c | 2 +- trunk/arch/x86/kernel/traps_64.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 33de4fee7a5c..4e1800ea816d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a25bd94964e87b1b93903a822fba5025d995d4da +refs/heads/master: aafbd7eb2057edfc9a17b258e3f0258a4e6d8198 diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c index 383760bfd283..4e65ae8a54bf 100644 --- a/trunk/arch/x86/kernel/process_64.c +++ b/trunk/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/trunk/arch/x86/kernel/traps_64.c b/trunk/arch/x86/kernel/traps_64.c index 0bba7924604e..814801f4eb9e 100644 --- a/trunk/arch/x86/kernel/traps_64.c +++ b/trunk/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);