projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'e26a9e0' into stable/for-linus-3.15
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
smtc.c
diff --git
a/arch/mips/kernel/smtc.c
b/arch/mips/kernel/smtc.c
index
dfc1b91
..
c1681d6
100644
(file)
--- a/
arch/mips/kernel/smtc.c
+++ b/
arch/mips/kernel/smtc.c
@@
-1007,7
+1007,7
@@
static void __irq_entry smtc_clock_tick_interrupt(void)
int irq = MIPS_CPU_IRQ_BASE + 1;
irq_enter();
- kstat_incr_irq
s_this_cpu(irq, irq_to_desc(irq)
);
+ kstat_incr_irq
_this_cpu(irq
);
cd = &per_cpu(mips_clockevent_device, cpu);
cd->event_handler(cd);
irq_exit();