ia64/xen-unstable

changeset 6570:8af8ddf91078

Fix non-SMP build, broken by the previous changeset.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Aug 31 14:53:43 2005 +0000 (2005-08-31)
parents 6fdbb0e35083
children f0dc15fd3c1b
files linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Wed Aug 31 14:20:56 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Wed Aug 31 14:53:43 2005 +0000
     1.3 @@ -562,8 +562,13 @@ do {									\
     1.4  #define local_irq_enable()	__sti()
     1.5  
     1.6  /* Don't use smp_processor_id: this is called in debug versions of that fn. */
     1.7 +#ifdef CONFIG_SMP
     1.8  #define irqs_disabled()			\
     1.9      HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
    1.10 +#else
    1.11 +#define irqs_disabled()			\
    1.12 +    HYPERVISOR_shared_info->vcpu_data[0].evtchn_upcall_mask
    1.13 +#endif
    1.14  
    1.15  /*
    1.16   * disable hlt during certain critical i/o operations
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h	Wed Aug 31 14:20:56 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h	Wed Aug 31 14:53:43 2005 +0000
     2.3 @@ -388,8 +388,13 @@ void cpu_idle_wait(void);
     2.4  #define local_irq_enable()	__sti()
     2.5  
     2.6  /* Don't use smp_processor_id: this is called in debug versions of that fn. */
     2.7 +#ifdef CONFIG_SMP
     2.8  #define irqs_disabled()			\
     2.9      HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
    2.10 +#else
    2.11 +#define irqs_disabled()			\
    2.12 +    HYPERVISOR_shared_info->vcpu_data[0].evtchn_upcall_mask
    2.13 +#endif
    2.14  
    2.15  /*
    2.16   * disable hlt during certain critical i/o operations