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

Commit 02ca752e authored by Jan Beulich's avatar Jan Beulich Committed by Ingo Molnar
Browse files

x86: Remove die_nmi() 



With no caller left, the function and the DIE_NMIWATCHDOG
enumerator can both go away.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Don Zickus <dzickus@redhat.com>
LKML-Reference: <4D5D521C0200007800032702@vpn.id2.novell.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e4cc9f4a

arch/x86/include/asm/kdebug.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ enum die_val { 
	DIE_PANIC,

	DIE_NMI,

	DIE_DIE,

	DIE_NMIWATCHDOG,

	DIE_KERNELDEBUG,

	DIE_TRAP,

	DIE_GPF,

arch/x86/include/asm/nmi.h

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 


#ifdef CONFIG_X86_LOCAL_APIC



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

extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);

extern int reserve_perfctr_nmi(unsigned int);

extern void release_perfctr_nmi(unsigned int);

arch/x86/kernel/dumpstack.c

+0 −25
Original line number Diff line number Diff line
@@ -320,31 +320,6 @@ void die(const char *str, struct pt_regs *regs, long err) 
	oops_end(flags, regs, sig);

}



void notrace __kprobes

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

{

	unsigned long flags;



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

		return;



	/*

	 * We are in trouble anyway, lets at least try

	 * to get a message out.

	 */

	flags = oops_begin();

	printk(KERN_EMERG "%s", str);

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

		smp_processor_id(), regs->ip);

	show_registers(regs);

	oops_end(flags, regs, 0);

	if (do_panic || panic_on_oops)

		panic("Non maskable interrupt");

	nmi_exit();

	local_irq_enable();

	do_exit(SIGBUS);

}



static int __init oops_setup(char *s)

{

	if (!s)

arch/x86/kernel/kgdb.c

+0 −9
Original line number Diff line number Diff line
@@ -533,15 +533,6 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd) 
		}

		return NOTIFY_DONE;



	case DIE_NMIWATCHDOG:

		if (atomic_read(&kgdb_active) != -1) {

			/* KGDB CPU roundup: */

			kgdb_nmicallback(raw_smp_processor_id(), regs);

			return NOTIFY_STOP;

		}

		/* Enter debugger: */

		break;



	case DIE_DEBUG:

		if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {

			if (user_mode(regs))