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

Commit 8183e2b3 authored by David S. Miller's avatar David S. Miller
Browse files

sparc64: Fix NMI programming when perf events are active. 



If perf events are active, we should not reset the %pcr to
PCR_PIC_PRIV.  That perf events code does the management.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5958eed7

arch/sparc/kernel/nmi.c

+2 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) 
	int cpu = smp_processor_id();



	clear_softint(1 << irq);

	pcr_ops->write(PCR_PIC_PRIV);



	local_cpu_data().__nmi_count++;
@@ -105,6 +104,8 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) 
	if (notify_die(DIE_NMI, "nmi", regs, 0,

		       pt_regs_trap_type(regs), SIGINT) == NOTIFY_STOP)

		touched = 1;

	else

		pcr_ops->write(PCR_PIC_PRIV);



	sum = kstat_irqs_cpu(0, cpu);

	if (__get_cpu_var(nmi_touch)) {