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

Commit e56b3a12 authored May 24, 2008 by Cyrill Gorcunov Committed by Thomas Gleixner May 25, 2008

x86: nmi - die_nmi() output message unification



Make 64bit die_nmi() to produce the same message as 32bit mode has

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: hpa@zytor.com
Cc: mingo@redhat.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent ddca03c9

arch/x86/kernel/nmi_64.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -358,8 +358,8 @@ nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
	*/		*/
	local_inc(&__get_cpu_var(alert_counter));		local_inc(&__get_cpu_var(alert_counter));
	if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz)		if (local_read(&__get_cpu_var(alert_counter)) == 5*nmi_hz)
	die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs,		die_nmi("NMI Watchdog detected LOCKUP",
	panic_on_timeout);		regs, panic_on_timeout);
	} else {		} else {
	__get_cpu_var(last_irq_sum) = sum;		__get_cpu_var(last_irq_sum) = sum;
	local_set(&__get_cpu_var(alert_counter), 0);		local_set(&__get_cpu_var(alert_counter), 0);

arch/x86/kernel/traps_64.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -614,7 +614,9 @@ die_nmi(char str, struct pt_regs regs, int do_panic)
	* We are in trouble anyway, lets at least try		* We are in trouble anyway, lets at least try
	* to get a message out.		* to get a message out.
	*/		*/
	printk(str, smp_processor_id());		printk(KERN_EMERG "%s", str);
			printk(" on CPU%d, ip %08lx, registers:\n",
			smp_processor_id(), regs->ip);
	show_registers(regs);		show_registers(regs);
	if (kexec_should_crash(current))		if (kexec_should_crash(current))
	crash_kexec(regs);		crash_kexec(regs);