projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge ../linus
[linux-drm-fsl-dcu.git]
/
arch
/
cris
/
arch-v32
/
kernel
/
time.c
diff --git
a/arch/cris/arch-v32/kernel/time.c
b/arch/cris/arch-v32/kernel/time.c
index 50f3f93293d64d33c8b1183a6971faf68eca0912..be0a01657d4fc88076e120b88264977acd25d2ed 100644
(file)
--- a/
arch/cris/arch-v32/kernel/time.c
+++ b/
arch/cris/arch-v32/kernel/time.c
@@
-219,7
+219,7
@@
timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
/* call the real timer interrupt handler */
- do_timer(
regs
);
+ do_timer(
1
);
/*
* If we have an externally synchronized Linux clock, then update