[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4@git.kernel.org>
Date: Tue, 1 Feb 2011 09:21:33 GMT
From: tip-bot for Thomas Gleixner <tglx@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
torbenh@....de, peterz@...radead.org, tglx@...utronix.de,
mingo@...e.hu
Subject: [tip:timers/core] time: Fix legacy arch fallout
Commit-ID: 7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4
Gitweb: http://git.kernel.org/tip/7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Tue, 1 Feb 2011 09:34:58 +0100
Committer: Ingo Molnar <mingo@...e.hu>
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@...utronix.de>
Reported-by: Ingo Molnar <mingo@...e.hu>
Cc: Torben Hohn <torbenh@....de>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: johnstul@...ibm.com
Cc: yong.zhang0@...il.com
Cc: hch@...radead.org
LKML-Reference: <20110127145905.23248.30458.stgit@...alhost>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists