forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x86: Remove die_nmi()

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

Signed-off-by: Jan 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: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jan Beulich 2011-02-17 15:51:40 +00:00 • committed by Ingo Molnar
commit 02ca752e41
4 changed files with 0 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/include/asm/kdebug.h
View file

@ -13,7 +13,6 @@ enum die_val {
DIE_PANIC, DIE_PANIC,
DIE_NMI, DIE_NMI,
DIE_DIE, DIE_DIE,
DIE_NMIWATCHDOG,
DIE_KERNELDEBUG, DIE_KERNELDEBUG,
DIE_TRAP, DIE_TRAP,
DIE_GPF, DIE_GPF,

1
arch/x86/include/asm/nmi.h
View file

@ -7,7 +7,6 @@
#ifdef CONFIG_X86_LOCAL_APIC #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 avail_to_resrv_perfctr_nmi_bit(unsigned int);
extern int reserve_perfctr_nmi(unsigned int); extern int reserve_perfctr_nmi(unsigned int);
extern void release_perfctr_nmi(unsigned int); extern void release_perfctr_nmi(unsigned int);

25
arch/x86/kernel/dumpstack.c
View file

@ -320,31 +320,6 @@ void die(const char *str, struct pt_regs *regs, long err)
oops_end(flags, regs, sig); 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) static int __init oops_setup(char *s)
{ {
if (!s) if (!s)

9
arch/x86/kernel/kgdb.c
View file

@ -533,15 +533,6 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
} }
return NOTIFY_DONE; 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: case DIE_DEBUG:
if (atomic_read(&kgdb_cpu_doing_single_step) != -1) { if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
if (user_mode(regs)) if (user_mode(regs))