diff options
Diffstat (limited to 'arch/sparc/kernel/nmi.c')
| -rw-r--r-- | arch/sparc/kernel/nmi.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc/kernel/nmi.c b/arch/sparc/kernel/nmi.c index f30f4a1ead23..d242a7340541 100644 --- a/arch/sparc/kernel/nmi.c +++ b/arch/sparc/kernel/nmi.c | |||
| @@ -96,7 +96,6 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) | |||
| 96 | int cpu = smp_processor_id(); | 96 | int cpu = smp_processor_id(); |
| 97 | 97 | ||
| 98 | clear_softint(1 << irq); | 98 | clear_softint(1 << irq); |
| 99 | pcr_ops->write(PCR_PIC_PRIV); | ||
| 100 | 99 | ||
| 101 | local_cpu_data().__nmi_count++; | 100 | local_cpu_data().__nmi_count++; |
| 102 | 101 | ||
| @@ -105,6 +104,8 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) | |||
| 105 | if (notify_die(DIE_NMI, "nmi", regs, 0, | 104 | if (notify_die(DIE_NMI, "nmi", regs, 0, |
| 106 | pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP) | 105 | pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP) |
| 107 | touched = 1; | 106 | touched = 1; |
| 107 | else | ||
| 108 | pcr_ops->write(PCR_PIC_PRIV); | ||
| 108 | 109 | ||
| 109 | sum = kstat_irqs_cpu(0, cpu); | 110 | sum = kstat_irqs_cpu(0, cpu); |
| 110 | if (__get_cpu_var(nmi_touch)) { | 111 | if (__get_cpu_var(nmi_touch)) { |
