ia64/xen-unstable

changeset 2119:1baf3765a8d9

bitkeeper revision 1.1159.1.9 (4115e9d2mgdM0_n-I2FN67cu3U6EOg)

Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into freefall.cl.cam.ac.uk:/auto/groups/xeno/users/cl349/BK/xeno.bk-26dom0
author cl349@freefall.cl.cam.ac.uk
date Sun Aug 08 08:52:34 2004 +0000 (2004-08-08)
parents bab0a551830b 7f8d6a86f019
children de0a88369f30
files linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c	Sat Aug 07 14:33:41 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c	Sun Aug 08 08:52:34 2004 +0000
     1.3 @@ -193,7 +193,8 @@ void __init select_idle_routine(const st
     1.4  		}
     1.5  		return;
     1.6  	}
     1.7 -	pm_idle = xen_cpu_idle;
     1.8 +	if (!pm_idle)
     1.9 +		pm_idle = default_idle;
    1.10  	return;
    1.11  }
    1.12  
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c	Sat Aug 07 14:33:41 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/setup.c	Sun Aug 08 08:52:34 2004 +0000
     2.3 @@ -148,6 +148,8 @@ int nr_multicall_ents = 0;
     2.4  /* Raw start-of-day parameters from the hypervisor. */
     2.5  union start_info_union start_info_union;
     2.6  
     2.7 +extern void (*pm_idle)(void);
     2.8 +
     2.9  static void __init limit_regions(unsigned long long size)
    2.10  {
    2.11  	unsigned long long current_addr = 0;
    2.12 @@ -1105,6 +1107,8 @@ void __init setup_arch(char **cmdline_p)
    2.13  			     VMASST_TYPE_writeable_pagetables);
    2.14  #endif
    2.15  
    2.16 +	pm_idle = xen_cpu_idle;
    2.17 +
    2.18  	memcpy(&boot_cpu_data, &new_cpu_data, sizeof(new_cpu_data));
    2.19  	early_cpu_init();
    2.20