Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aafbd7eb authored Jan 30, 2008 by Arjan van de Ven Committed by Ingo Molnar Jan 30, 2008

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>

parent a25bd949

arch/x86/kernel/process_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",

arch/x86/kernel/traps_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);