summaryrefslogtreecommitdiff
path: root/kernel/timer.c
diff options
context:
space:
mode:
authorNathan Scott <nathans@bruce>2006-03-22 15:31:14 +1100
committerNathan Scott <nathans@bruce>2006-03-22 15:31:14 +1100
commit4d74f423c722b8cadfabe087369200013b217b67 (patch)
treed62facddfdb0dfd89f3e61f4fc699cf2feb4b082 /kernel/timer.c
parentbb19fba1937cb6ab2bb98ac893365f6ebf88ef1b (diff)
parente952f31bce6e9f64db01f607abc46529ba57ac9e (diff)
Merge HEAD from ../linux-2.6
Diffstat (limited to 'kernel/timer.c')
-rw-r--r--kernel/timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index bf7c4193b936..2410c18dbeb1 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1354,8 +1354,8 @@ void __init init_timers(void)
#ifdef CONFIG_TIME_INTERPOLATION
-struct time_interpolator *time_interpolator;
-static struct time_interpolator *time_interpolator_list;
+struct time_interpolator *time_interpolator __read_mostly;
+static struct time_interpolator *time_interpolator_list __read_mostly;
static DEFINE_SPINLOCK(time_interpolator_lock);
static inline u64 time_interpolator_get_cycles(unsigned int src)