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 branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
time.c
diff --git
a/arch/ia64/kernel/time.c
b/arch/ia64/kernel/time.c
index
6928ef0
..
1626268
100644
(file)
--- a/
arch/ia64/kernel/time.c
+++ b/
arch/ia64/kernel/time.c
@@
-78,7
+78,7
@@
timer_interrupt (int irq, void *dev_id, struct pt_regs *regs)
* xtime_lock.
*/
write_seqlock(&xtime_lock);
- do_timer(
regs
);
+ do_timer(
1
);
local_cpu_data->itm_next = new_itm;
write_sequnlock(&xtime_lock);
} else