# HG changeset patch
# User kaf24@scramble.cl.cam.ac.uk
# Date 1106259529 0
# Node ID c90e94e09339b2d92ff32373077c4db70e0d5599
# Parent  50402a6cc3d80662bbdffcdbea689f688a7c2d93# Parent  bf476d24f7988b7bf65fe62c383bcf3186f617a2
bitkeeper revision 1.1159.224.3 (41f02e490kpSofHA0mGdhL54XCyaXA)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


diff -r 50402a6cc3d8 -r c90e94e09339 linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c	Wed Jan 19 15:08:17 2005 +0000
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c	Thu Jan 20 22:18:49 2005 +0000
@@ -85,7 +85,7 @@ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED
 spinlock_t i8253_lock = SPIN_LOCK_UNLOCKED;
 EXPORT_SYMBOL(i8253_lock);
 
-extern struct init_timer_opts __initdata timer_tsc_init;
+extern struct init_timer_opts timer_tsc_init;
 extern struct timer_opts timer_tsc;
 struct timer_opts *cur_timer = &timer_tsc;
 
diff -r 50402a6cc3d8 -r c90e94e09339 linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Wed Jan 19 15:08:17 2005 +0000
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Thu Jan 20 22:18:49 2005 +0000
@@ -326,7 +326,7 @@ static inline void cpufreq_delayed_get(v
 #endif 
 
 
-static int __init init_tsc(char* override)
+static int init_tsc(char* override)
 {
 	u64 __cpu_khz;
 
@@ -373,7 +373,7 @@ struct timer_opts timer_tsc = {
 	.delay = delay_tsc,
 };
 
-struct init_timer_opts __initdata timer_tsc_init = {
+struct init_timer_opts timer_tsc_init = {
 	.init = init_tsc,
 	.opts = &timer_tsc,
 };