lkml.org 
[lkml]   [2010]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[24/30] sparc64: Fix NMI programming when perf events are active.
2.6.32-stable review patch.  If anyone has any objections, please let us know.

------------------

From: David S. Miller <davem@davemloft.net>

[ Upstream commit 8183e2b38480672a1f61d416812ac078ce94b67b ]

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: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---
arch/sparc/kernel/nmi.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

--- a/arch/sparc/kernel/nmi.c
+++ b/arch/sparc/kernel/nmi.c
@@ -96,7 +96,6 @@ notrace __kprobes void perfctr_irq(int i
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 i
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)) {



\
 
 \ /
  Last update: 2010-01-21 05:29    [W:0.070 / U:26.684 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site