summaryrefslogtreecommitdiffstats
path: root/kernel/time
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-01 09:34:58 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-01 09:46:47 +0100
commit7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4 (patch)
treefd802bad0c724185f6cb8e8790fc8d3bf0466494 /kernel/time
parente2830b5c1b2b2217894370a3b95af87d4a958401 (diff)
downloadblackbird-op-linux-7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4.tar.gz
blackbird-op-linux-7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4.zip
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>
Diffstat (limited to 'kernel/time')
-rw-r--r--kernel/time/tick-internal.h4
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 @@
#include <linux/hrtimer.h>
#include <linux/tick.h>
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BUILD
+
#define TICK_DO_TIMER_NONE -1
#define TICK_DO_TIMER_BOOT -2
@@ -135,5 +137,7 @@ static inline int tick_device_is_functional(struct clock_event_device *dev)
return !(dev->features & CLOCK_EVT_FEAT_DUMMY);
}
+#endif
+
extern void do_timer(unsigned long ticks);
extern seqlock_t xtime_lock;
OpenPOWER on IntegriCloud