ia64/xen-unstable

changeset 6289:3c1cd2486b7f

Unbreak the build in the non-CONFIG_SMP and x86_64 cases.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
author sos22@douglas.cl.cam.ac.uk
date Fri Aug 19 14:10:24 2005 +0000 (2005-08-19)
parents 56e5cf83e3af
children 87dec3b9c546 fd59d2620ac1
files linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c	Fri Aug 19 13:21:02 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/process.c	Fri Aug 19 14:10:24 2005 +0000
     1.3 @@ -790,3 +790,10 @@ unsigned long arch_align_stack(unsigned 
     1.4  		sp -= get_random_int() % 8192;
     1.5  	return sp & ~0xf;
     1.6  }
     1.7 +
     1.8 +
     1.9 +#ifndef CONFIG_X86_SMP
    1.10 +void _restore_vcpu(void)
    1.11 +{
    1.12 +}
    1.13 +#endif
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c	Fri Aug 19 13:21:02 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/process.c	Fri Aug 19 14:10:24 2005 +0000
     2.3 @@ -743,3 +743,9 @@ unsigned long arch_align_stack(unsigned 
     2.4  		sp -= get_random_int() % 8192;
     2.5  	return sp & ~0xf;
     2.6  }
     2.7 +
     2.8 +#ifndef CONFIG_SMP
     2.9 +void _restore_vcpu(void)
    2.10 +{
    2.11 +}
    2.12 +#endif
     3.1 --- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c	Fri Aug 19 13:21:02 2005 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/smpboot.c	Fri Aug 19 14:10:24 2005 +0000
     3.3 @@ -1286,4 +1286,10 @@ void smp_resume(void)
     3.4  	smp_intr_init();
     3.5  	local_setup_timer_irq();
     3.6  }
     3.7 +
     3.8 +void _restore_vcpu(void)
     3.9 +{
    3.10 +	/* XXX need to write this */
    3.11 +}
    3.12 +
    3.13  #endif