git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
sgi-ip22
/
ip22-time.c
diff --git
a/arch/mips/sgi-ip22/ip22-time.c
b/arch/mips/sgi-ip22/ip22-time.c
index 3dcb27ec0c530b7aa4238bc4eb2cd568cd9fc794..c8f7d2328b2425daf81a06cd07670be594e7affa 100644
(file)
--- a/
arch/mips/sgi-ip22/ip22-time.c
+++ b/
arch/mips/sgi-ip22/ip22-time.c
@@
-122,7
+122,7
@@
void indy_8254timer_irq(void)
char c;
irq_enter();
- kstat_
this_cpu.irqs[irq]++
;
+ kstat_
incr_irqs_this_cpu(irq, irq_to_desc(irq))
;
printk(KERN_ALERT "Oops, got 8254 interrupt.\n");
ArcRead(0, &c, 1, &cnt);
ArcEnterInteractiveMode();