git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
v850
/
kernel
/
time.c
diff --git
a/arch/v850/kernel/time.c
b/arch/v850/kernel/time.c
index
c1e85c2
..
cd06f47
100644
(file)
--- a/
arch/v850/kernel/time.c
+++ b/
arch/v850/kernel/time.c
@@
-10,7
+10,6
@@
* "A Kernel Model for Precision Timekeeping" by Dave Mills
*/
* "A Kernel Model for Precision Timekeeping" by Dave Mills
*/
-#include <linux/config.h> /* CONFIG_HEARTBEAT */
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@
-51,7
+50,7
@@
static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs)
if (mach_tick)
mach_tick ();
if (mach_tick)
mach_tick ();
- 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
@@
-177,7
+176,7
@@
EXPORT_SYMBOL(do_settimeofday);
static int timer_dev_id;
static struct irqaction timer_irqaction = {
timer_interrupt,
static int timer_dev_id;
static struct irqaction timer_irqaction = {
timer_interrupt,
-
SA_INTERRUPT
,
+
IRQF_DISABLED
,
CPU_MASK_NONE,
"timer",
&timer_dev_id,
CPU_MASK_NONE,
"timer",
&timer_dev_id,