ia64/xen-unstable

changeset 3470:c90e94e09339

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
author kaf24@scramble.cl.cam.ac.uk
date Thu Jan 20 22:18:49 2005 +0000 (2005-01-20)
parents 50402a6cc3d8 bf476d24f798
children d126cac32f08
files linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
line diff
     1.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c	Wed Jan 19 15:08:17 2005 +0000
     1.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c	Thu Jan 20 22:18:49 2005 +0000
     1.3 @@ -85,7 +85,7 @@ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED
     1.4  spinlock_t i8253_lock = SPIN_LOCK_UNLOCKED;
     1.5  EXPORT_SYMBOL(i8253_lock);
     1.6  
     1.7 -extern struct init_timer_opts __initdata timer_tsc_init;
     1.8 +extern struct init_timer_opts timer_tsc_init;
     1.9  extern struct timer_opts timer_tsc;
    1.10  struct timer_opts *cur_timer = &timer_tsc;
    1.11  
     2.1 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Wed Jan 19 15:08:17 2005 +0000
     2.2 +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c	Thu Jan 20 22:18:49 2005 +0000
     2.3 @@ -326,7 +326,7 @@ static inline void cpufreq_delayed_get(v
     2.4  #endif 
     2.5  
     2.6  
     2.7 -static int __init init_tsc(char* override)
     2.8 +static int init_tsc(char* override)
     2.9  {
    2.10  	u64 __cpu_khz;
    2.11  
    2.12 @@ -373,7 +373,7 @@ struct timer_opts timer_tsc = {
    2.13  	.delay = delay_tsc,
    2.14  };
    2.15  
    2.16 -struct init_timer_opts __initdata timer_tsc_init = {
    2.17 +struct init_timer_opts timer_tsc_init = {
    2.18  	.init = init_tsc,
    2.19  	.opts = &timer_tsc,
    2.20  };