linux/x86-64: make original definition of VGCF_IN_SYSCALL usable in assembly

Signed-off-by: Jan Beulich <jbeulich@novell.com>

diff --git a/arch/x86_64/kernel/xen_entry.S b/arch/x86_64/kernel/xen_entry.S
index b3d7f1940554199bf17f9a5478993ae25e8f0eb6..66efa07db1263a06baaab1e8552454d353657510 100644 (file)
--- a/arch/x86_64/kernel/xen_entry.S
+++ b/arch/x86_64/kernel/xen_entry.S
@@ -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 --git a/include/xen/interface/arch-x86/xen-x86_64.h b/include/xen/interface/arch-x86/xen-x86_64.h
index 80135d25ca3a3fce479e5493a716c476908345d3..843c0bbbdc109c7b2d18a8f6f3e0940061957375 100644 (file)
--- a/include/xen/interface/arch-x86/xen-x86_64.h
+++ b/include/xen/interface/arch-x86/xen-x86_64.h
@@ -97,8 +97,6 @@
 #define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START)
 #endif
 
-#ifndef __ASSEMBLY__
-
 /*
  * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)
  *  @which == SEGBASE_*  ;  @base == 64-bit base address
@@ -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;