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
/
sparc
/
kernel
/
pcic.c
diff --git
a/arch/sparc/kernel/pcic.c
b/arch/sparc/kernel/pcic.c
index
bfd31aa
..
e19b1ba
100644
(file)
--- a/
arch/sparc/kernel/pcic.c
+++ b/
arch/sparc/kernel/pcic.c
@@
-712,7
+712,7
@@
static irqreturn_t pcic_timer_handler (int irq, void *h, struct pt_regs *regs)
{
write_seqlock(&xtime_lock); /* Dummy, to show that we remember */
pcic_clear_clock_irq();
{
write_seqlock(&xtime_lock); /* Dummy, to show that we remember */
pcic_clear_clock_irq();
- do_timer(
regs
);
+ do_timer(
1
);
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
#endif
#ifndef CONFIG_SMP
update_process_times(user_mode(regs));
#endif