xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into percpu

Browse Source
This commit is contained in:
Tejun Heo
2010-02-02 14:38:15 +09:00
parent dbfc196a3c ab658321f3
commit ab386128f2
1258 changed files with 33261 additions and 12809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/sparc/kernel/nmi.c
View File

@@ -95,7 +95,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++;
@@ -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;
else
pcr_ops->write(PCR_PIC_PRIV);
sum = kstat_irqs_cpu(0, cpu);
if (__get_cpu_var(nmi_touch)) {