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

Commit dd6e4eba authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

dumpstack: x86: move die_nmi to dumpstack_32.c 



For some reason die_nmi is still defined in traps.c for
i386, but is found in dumpstack_64.c for x86_64. Move it
to dumpstack_32.c

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 8728861b

arch/x86/kernel/dumpstack_32.c

+36 −0
Original line number Diff line number Diff line
@@ -403,6 +403,42 @@ void die(const char *str, struct pt_regs *regs, long err) 
	oops_end(flags, regs, SIGSEGV);

}



static DEFINE_SPINLOCK(nmi_print_lock);



void notrace __kprobes

die_nmi(char *str, struct pt_regs *regs, int do_panic)

{

	if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)

		return;



	spin_lock(&nmi_print_lock);

	/*

	* We are in trouble anyway, lets at least try

	* to get a message out:

	*/

	bust_spinlocks(1);

	printk(KERN_EMERG "%s", str);

	printk(" on CPU%d, ip %08lx, registers:\n",

		smp_processor_id(), regs->ip);

	show_registers(regs);

	if (do_panic)

		panic("Non maskable interrupt");

	console_silent();

	spin_unlock(&nmi_print_lock);

	bust_spinlocks(0);



	/*

	 * If we are in kernel we are probably nested up pretty bad

	 * and might aswell get out now while we still can:

	 */

	if (!user_mode_vm(regs)) {

		current->thread.trap_no = 2;

		crash_kexec(regs);

	}



	do_exit(SIGSEGV);

}



static int __init kstack_setup(char *s)

{

	kstack_depth_to_print = simple_strtoul(s, NULL, 0);

arch/x86/kernel/traps.c

+0 −37
Original line number Diff line number Diff line
@@ -429,43 +429,6 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs) 
	printk(KERN_EMERG "Dazed and confused, but trying to continue\n");

}



#ifdef CONFIG_X86_32

static DEFINE_SPINLOCK(nmi_print_lock);



void notrace __kprobes die_nmi(char *str, struct pt_regs *regs, int do_panic)

{

	if (notify_die(DIE_NMIWATCHDOG, str, regs, 0, 2, SIGINT) == NOTIFY_STOP)

		return;



	spin_lock(&nmi_print_lock);

	/*

	* We are in trouble anyway, lets at least try

	* to get a message out:

	*/

	bust_spinlocks(1);

	printk(KERN_EMERG "%s", str);

	printk(" on CPU%d, ip %08lx, registers:\n",

		smp_processor_id(), regs->ip);

	show_registers(regs);

	if (do_panic)

		panic("Non maskable interrupt");

	console_silent();

	spin_unlock(&nmi_print_lock);

	bust_spinlocks(0);



	/*

	 * If we are in kernel we are probably nested up pretty bad

	 * and might aswell get out now while we still can:

	 */

	if (!user_mode_vm(regs)) {

		current->thread.trap_no = 2;

		crash_kexec(regs);

	}



	do_exit(SIGSEGV);

}

#endif



static notrace __kprobes void default_do_nmi(struct pt_regs *regs)

{

	unsigned char reason = 0;