git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pm+acpi-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
time_64.c
diff --git
a/arch/sparc/kernel/time_64.c
b/arch/sparc/kernel/time_64.c
index
b397e05
..
3fddf64
100644
(file)
--- a/
arch/sparc/kernel/time_64.c
+++ b/
arch/sparc/kernel/time_64.c
@@
-732,7
+732,7
@@
void __irq_entry timer_interrupt(int irq, struct pt_regs *regs)
irq_enter();
local_cpu_data().irq0_irqs++;
- kstat_incr_irq
s_this_cpu(0, irq_to_desc(0)
);
+ kstat_incr_irq
_this_cpu(0
);
if (unlikely(!evt->event_handler)) {
printk(KERN_WARNING