Jan Beulich
2008-Mar-13 16:06 UTC
[Xen-devel] [PATCH] linux/x86-64: make original definition of VGCF_IN_SYSCALL usable in assembly
This changes an interface header; the patch touching the hypervisor
code only is attached.
As usual, written and tested on 2.6.25-rc5 and made apply to the 2.6.18
tree without further testing.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: head-2008-03-11/arch/x86_64/kernel/xen_entry.S
==================================================================---
head-2008-03-11.orig/arch/x86_64/kernel/xen_entry.S
+++ head-2008-03-11.orig/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)
-
-
Index: head-2008-03-11/include/xen/interface/arch-x86/xen-x86_64.h
==================================================================---
head-2008-03-11.orig/include/xen/interface/arch-x86/xen-x86_64.h
+++ head-2008-03-11/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;
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel