[Xen-changelog] [linux-2.6.18-xen] linux/x86-64: make original definition of VGCF_IN_SYSCALL usable in assembly

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1205838963 0
# Node ID f122c54b87404fcb8ec030f26e11d412de578a9d
# Parent  6a196954e47927cd63ee98d1d11271358fabaab9
linux/x86-64: make original definition of VGCF_IN_SYSCALL usable in assembly
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 arch/x86_64/kernel/xen_entry.S              |    4 ----
 include/xen/interface/arch-x86/xen-x86_64.h |    5 +++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff -r 6a196954e479 -r f122c54b8740 arch/x86_64/kernel/xen_entry.S
--- a/arch/x86_64/kernel/xen_entry.S    Tue Mar 18 11:13:37 2008 +0000
+++ b/arch/x86_64/kernel/xen_entry.S    Tue Mar 18 11:16:03 2008 +0000
@@ -34,7 +34,3 @@
                                XEN_LOCKED_UNBLOCK_EVENTS(reg)          ; \
                                XEN_PUT_VCPU_INFO(reg)
 #define XEN_TEST_PENDING(reg)  testb $0xFF,evtchn_upcall_pending(reg)
-
-VGCF_IN_SYSCALL = (1<<8)
-        
-       
diff -r 6a196954e479 -r f122c54b8740 include/xen/interface/arch-x86/xen-x86_64.h
--- a/include/xen/interface/arch-x86/xen-x86_64.h       Tue Mar 18 11:13:37 
2008 +0000
+++ b/include/xen/interface/arch-x86/xen-x86_64.h       Tue Mar 18 11:16:03 
2008 +0000
@@ -96,8 +96,6 @@
 #ifndef machine_to_phys_mapping
 #define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START)
 #endif
-
-#ifndef __ASSEMBLY__
 
 /*
  * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)
@@ -133,6 +131,9 @@
 #define _VGCF_in_syscall 8
 #define VGCF_in_syscall  (1<<_VGCF_in_syscall)
 #define VGCF_IN_SYSCALL  VGCF_in_syscall
+
+#ifndef __ASSEMBLY__
+
 struct iret_context {
     /* Top of stack (%rsp at point of hypercall). */
     uint64_t rax, r11, rcx, flags, rip, cs, rflags, rsp, ss;

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