luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sparc64: Use nmi_enter() and nmi_exit(), as needed.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2009-09-10 05:56:16 -07:00
parent 76c36d016a
commit 2d0740c456
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/sparc/kernel/nmi.c
View File

@ -84,6 +84,7 @@ static void die_nmi(const char *str, struct pt_regs *regs, int do_panic)
if (do_panic || panic_on_oops) if (do_panic || panic_on_oops)
panic("Non maskable interrupt"); panic("Non maskable interrupt");
nmi_exit();
local_irq_enable(); local_irq_enable();
do_exit(SIGBUS); do_exit(SIGBUS);
} }
@ -98,6 +99,8 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
local_cpu_data().__nmi_count++; local_cpu_data().__nmi_count++;
nmi_enter();
if (notify_die(DIE_NMI, "nmi", regs, 0, if (notify_die(DIE_NMI, "nmi", regs, 0,
pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP) pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
touched = 1; touched = 1;
@ -120,6 +123,8 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
write_pic(picl_value(nmi_hz)); write_pic(picl_value(nmi_hz));
pcr_ops->write(pcr_enable); pcr_ops->write(pcr_enable);
} }
nmi_exit();
} }
static inline unsigned int get_nmi_count(int cpu) static inline unsigned int get_nmi_count(int cpu)