diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-01 03:34:58 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-01 03:46:47 -0500 |
commit | 7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4 (patch) | |
tree | fd802bad0c724185f6cb8e8790fc8d3bf0466494 | |
parent | e2830b5c1b2b2217894370a3b95af87d4a958401 (diff) |
time: Fix legacy arch fallout
The xtime/dotimer cleanup broke architectures which do not implement
clockevents. Time to send out another __do_IRQ threat.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reported-by: Ingo Molnar <mingo@elte.hu>
Cc: Torben Hohn <torbenh@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: johnstul@us.ibm.com
Cc: yong.zhang0@gmail.com
Cc: hch@infradead.org
LKML-Reference: <20110127145905.23248.30458.stgit@localhost>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | kernel/time/tick-internal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index 28c578568c9d..f77b93df0006 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h | |||
@@ -4,6 +4,8 @@ | |||
4 | #include <linux/hrtimer.h> | 4 | #include <linux/hrtimer.h> |
5 | #include <linux/tick.h> | 5 | #include <linux/tick.h> |
6 | 6 | ||
7 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD | ||
8 | |||
7 | #define TICK_DO_TIMER_NONE -1 | 9 | #define TICK_DO_TIMER_NONE -1 |
8 | #define TICK_DO_TIMER_BOOT -2 | 10 | #define TICK_DO_TIMER_BOOT -2 |
9 | 11 | ||
@@ -135,5 +137,7 @@ static inline int tick_device_is_functional(struct clock_event_device *dev) | |||
135 | return !(dev->features & CLOCK_EVT_FEAT_DUMMY); | 137 | return !(dev->features & CLOCK_EVT_FEAT_DUMMY); |
136 | } | 138 | } |
137 | 139 | ||
140 | #endif | ||
141 | |||
138 | extern void do_timer(unsigned long ticks); | 142 | extern void do_timer(unsigned long ticks); |
139 | extern seqlock_t xtime_lock; | 143 | extern seqlock_t xtime_lock; |