Commit-ID: 7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4 Gitweb: http://git.kernel.org/tip/7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4 Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx> AuthorDate: Tue, 1 Feb 2011 09:34:58 +0100 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Tue, 1 Feb 2011 09:46:47 +0100 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@xxxxxxxxxxxxx> Reported-by: Ingo Molnar <mingo@xxxxxxx> Cc: Torben Hohn <torbenh@xxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: johnstul@xxxxxxxxxx Cc: yong.zhang0@xxxxxxxxx Cc: hch@xxxxxxxxxxxxx LKML-Reference: <20110127145905.23248.30458.stgit@localhost> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- 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 28c5785..f77b93d 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; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|