git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into percpu
[safe/jmp/linux-2.6]
/
arch
/
sparc
/
kernel
/
nmi.c
diff --git
a/arch/sparc/kernel/nmi.c
b/arch/sparc/kernel/nmi.c
index
9b9f5b4
..
b287b62
100644
(file)
--- a/
arch/sparc/kernel/nmi.c
+++ b/
arch/sparc/kernel/nmi.c
@@
-95,7
+95,6
@@
notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
int cpu = smp_processor_id();
clear_softint(1 << irq);
int cpu = smp_processor_id();
clear_softint(1 << irq);
- pcr_ops->write(PCR_PIC_PRIV);
local_cpu_data().__nmi_count++;
local_cpu_data().__nmi_count++;
@@
-104,6
+103,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;
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)) {
sum = kstat_irqs_cpu(0, cpu);
if (__get_cpu_var(nmi_touch)) {