[Xen-changelog] Fix DEBUG_PREEMPT builds. irq_disabled() macro must not use

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID 6fdbb0e3508385e2835dce8312baafb56c968baa
# Parent  a51e78a2a01a7012b64de7f5c1a1bc2610b3fd5b
Fix DEBUG_PREEMPT builds. irq_disabled() macro must not use
smp_processor_id(). Use the underlying function instead.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r a51e78a2a01a -r 6fdbb0e35083 
linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h    Wed Aug 31 
12:56:42 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/system.h    Wed Aug 31 
14:20:56 2005
@@ -561,8 +561,9 @@
 #define local_irq_disable()    __cli()
 #define local_irq_enable()     __sti()
 
+/* Don't use smp_processor_id: this is called in debug versions of that fn. */
 #define irqs_disabled()                        \
-    HYPERVISOR_shared_info->vcpu_data[smp_processor_id()].evtchn_upcall_mask
+    HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
 
 /*
  * disable hlt during certain critical i/o operations
diff -r a51e78a2a01a -r 6fdbb0e35083 
linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h  Wed Aug 31 
12:56:42 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-x86_64/system.h  Wed Aug 31 
14:20:56 2005
@@ -387,8 +387,9 @@
 #define local_irq_disable()    __cli()
 #define local_irq_enable()     __sti()
 
+/* Don't use smp_processor_id: this is called in debug versions of that fn. */
 #define irqs_disabled()                        \
-    HYPERVISOR_shared_info->vcpu_data[smp_processor_id()].evtchn_upcall_mask
+    HYPERVISOR_shared_info->vcpu_data[__smp_processor_id()].evtchn_upcall_mask
 
 /*
  * disable hlt during certain critical i/o operations

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog