bitkeeper revision 1.1159.223.7 (41f02e18RcwEdT0BXMaReeOUBf3KVw)

timer_tsc.c, time.c:
  Fix time restore bug.

diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c
index 712e0948f1d1484dace9dd54b0f62c6dad2ecdc4..47eabac20598d28b3784dc46a78fe7bc4db39a17 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c
@@ -84,7 +84,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 --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
index f885505a8b37bfca37aa0e4052b1f9bcf53937b8..1947e910ef13e4cf7bf883310af115ebc1898604 100644 (file)
--- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
+++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
@@ -326,7 +326,7 @@ static inline void cpufreq_delayed_get(void) { return; }
 #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,
 };