From: Keir Fraser <keir.fraser@citrix.com>
Date: Tue, 18 Mar 2008 11:15:20 +0000 (+0000)
Subject: x86_64: Make VGCF_in_syscall definition available to assembly code.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14247^2~56
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b698a6a18c01ee95ca3cc764e4ba7f8d55593c3b;p=xen.git

x86_64: Make VGCF_in_syscall definition available to assembly code.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
---

diff --git a/xen/include/public/arch-x86/xen-x86_64.h b/xen/include/public/arch-x86/xen-x86_64.h
index 80135d25ca..843c0bbbdc 100644
--- a/xen/include/public/arch-x86/xen-x86_64.h
+++ b/xen/include/public/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;