xen-vtx-unstable

diff linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h @ 6568:dd668f7527cb

merge?
author cl349@firebug.cl.cam.ac.uk
date Thu Sep 01 10:16:14 2005 +0000 (2005-09-01)
parents 38312fe7ec38 f0dc15fd3c1b
children e17161930711 4d899a738d59 e7c7196fa329
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Thu Sep 01 10:08:53 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Thu Sep 01 10:16:14 2005 +0000
     1.3 @@ -561,8 +561,14 @@ do {									\
     1.4  #define local_irq_disable()	__cli()
     1.5  #define local_irq_enable()	__sti()
     1.6  
     1.7 +/* Don't use smp_processor_id: this is called in debug versions of that fn. */
     1.8 +#ifdef CONFIG_SMP
     1.9  #define irqs_disabled()			\
    1.10 -    HYPERVISOR_shared_info->vcpu_data[smp_processor_id()].evtchn_upcall_mask
    1.11 +    HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
    1.12 +#else
    1.13 +#define irqs_disabled()			\
    1.14 +    HYPERVISOR_shared_info->vcpu_data[0].evtchn_upcall_mask
    1.15 +#endif
    1.16  
    1.17  /*
    1.18   * disable hlt during certain critical i/o operations