ia64/xen-unstable

changeset 6569:6fdbb0e35083

Fix DEBUG_PREEMPT builds. irq_disabled() macro must not use
smp_processor_id(). Use the underlying function instead.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Aug 31 14:20:56 2005 +0000 (2005-08-31)
parents a51e78a2a01a
children 8af8ddf91078
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 12:56:42 2005 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h	Wed Aug 31 14:20:56 2005 +0000
     1.3 @@ -561,8 +561,9 @@ 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  #define irqs_disabled()			\
     1.9 -    HYPERVISOR_shared_info->vcpu_data[smp_processor_id()].evtchn_upcall_mask
    1.10 +    HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
    1.11  
    1.12  /*
    1.13   * 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 12:56:42 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h	Wed Aug 31 14:20:56 2005 +0000
     2.3 @@ -387,8 +387,9 @@ void cpu_idle_wait(void);
     2.4  #define local_irq_disable()	__cli()
     2.5  #define local_irq_enable()	__sti()
     2.6  
     2.7 +/* Don't use smp_processor_id: this is called in debug versions of that fn. */
     2.8  #define irqs_disabled()			\
     2.9 -    HYPERVISOR_shared_info->vcpu_data[smp_processor_id()].evtchn_upcall_mask
    2.10 +    HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
    2.11  
    2.12  /*
    2.13   * disable hlt during certain critical i/o operations