Skip to content

Commit

Permalink
sparc64: Use nmi_enter() and nmi_exit(), as needed.
Browse files Browse the repository at this point in the history
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Sep 10, 2009
1 parent 76c36d0 commit 2d0740c
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions arch/sparc/kernel/nmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ static void die_nmi(const char *str, struct pt_regs *regs, int do_panic)
if (do_panic || panic_on_oops)
panic("Non maskable interrupt");

nmi_exit();
local_irq_enable();
do_exit(SIGBUS);
}
Expand All @@ -98,6 +99,8 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)

local_cpu_data().__nmi_count++;

nmi_enter();

if (notify_die(DIE_NMI, "nmi", regs, 0,
pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)
touched = 1;
Expand All @@ -120,6 +123,8 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
write_pic(picl_value(nmi_hz));
pcr_ops->write(pcr_enable);
}

nmi_exit();
}

static inline unsigned int get_nmi_count(int cpu)
Expand Down

0 comments on commit 2d0740c

Please sign in to comment.