From: "Jan Beulich" Subject: [PATCH] linux/x86-64: make original definition of VGCF_IN_SYSCALL usable in assembly Date: Thu, 13 Mar 2008 16:06:57 +0000 Message-ID: <47D95F31.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__Part96B00531.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__Part96B00531.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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 Index: head-2008-03-11/arch/x86_64/kernel/xen_entry.S =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 =3D (1<<8) - =20 -=09 Index: head-2008-03-11/include/xen/interface/arch-x86/xen-x86_64.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 =20 -#ifndef __ASSEMBLY__ - /* * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long = base) * @which =3D=3D SEGBASE_* ; @base =3D=3D 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; --=__Part96B00531.0__= Content-Type: text/plain; name="xen-x86_64-vgcf.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="xen-x86_64-vgcf.patch" Signed-off-by: Jan Beulich --- 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 =20 -#ifndef __ASSEMBLY__ - /* * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long = base) * @which =3D=3D SEGBASE_* ; @base =3D=3D 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; --=__Part96B00531.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__Part96B00531.0__=--