diff options
author | John Stultz <johnstul@us.ibm.com> | 2010-03-11 17:11:39 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-03-12 18:36:37 -0500 |
commit | 104f9c471ffb425fd081074ef31521b38d77592a (patch) | |
tree | abb978c84b51caf6c15cabab5641c983f1e0064c | |
parent | c4507257764ae0387f0d8c2ca57808f37e4c9439 (diff) |
xtensa: Fix unnecessary setting of xtime
xtensa supports read_persisitent_clock(), so there is no reason for
the arch specific code to be setting xtime. Setting xtime will be
done by the generic timekeeping code.
Signed-off-by: John Stultz <johnstul@us.ibm.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/xtensa/kernel/time.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c index 19f7df30937f..19df764f6399 100644 --- a/arch/xtensa/kernel/time.c +++ b/arch/xtensa/kernel/time.c | |||
@@ -60,11 +60,6 @@ static struct irqaction timer_irqaction = { | |||
60 | 60 | ||
61 | void __init time_init(void) | 61 | void __init time_init(void) |
62 | { | 62 | { |
63 | /* FIXME: xtime&wall_to_monotonic are set in timekeeping_init. */ | ||
64 | read_persistent_clock(&xtime); | ||
65 | set_normalized_timespec(&wall_to_monotonic, | ||
66 | -xtime.tv_sec, -xtime.tv_nsec); | ||
67 | |||
68 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT | 63 | #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT |
69 | printk("Calibrating CPU frequency "); | 64 | printk("Calibrating CPU frequency "); |
70 | platform_calibrate_ccount(); | 65 | platform_calibrate_ccount(); |