Merge branch 'x86/core' into tracing/textedit

Conflicts:
	arch/x86/Kconfig
	block/blktrace.c
	kernel/irq/handle.c

Semantic conflict:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/mn10300/kernel/mn10300-watchdog.c b/arch/mn10300/kernel/mn10300-watchdog.c
index 10811e981d2..2e370d88a87 100644
--- a/arch/mn10300/kernel/mn10300-watchdog.c
+++ b/arch/mn10300/kernel/mn10300-watchdog.c
@@ -130,6 +130,7 @@ void watchdog_interrupt(struct pt_regs *regs, enum exception_code excep)
          * the stack NMI-atomically, it's safe to use smp_processor_id().
          */
         int sum, cpu = smp_processor_id();
+        int irq = NMIIRQ;
         u8 wdt, tmp;
 
         wdt = WDCTR & ~WDCTR_WDCNE;
@@ -138,7 +139,7 @@ void watchdog_interrupt(struct pt_regs *regs, enum exception_code excep)
         NMICR = NMICR_WDIF;
 
         nmi_count(cpu)++;
-        kstat_this_cpu.irqs[NMIIRQ]++;
+        kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
         sum = irq_stat[cpu].__irq_count;
 
         if (last_irq_sums[cpu] == sum) {