ia64/linux-2.6.18-xen.hg

changeset 475:f122c54b8740

linux/x86-64: make original definition of VGCF_IN_SYSCALL usable in assembly
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Tue Mar 18 11:16:03 2008 +0000 (2008-03-18)
parents 6a196954e479
children 15d72fac31de
files arch/x86_64/kernel/xen_entry.S include/xen/interface/arch-x86/xen-x86_64.h
line diff
     1.1 --- a/arch/x86_64/kernel/xen_entry.S	Tue Mar 18 11:13:37 2008 +0000
     1.2 +++ b/arch/x86_64/kernel/xen_entry.S	Tue Mar 18 11:16:03 2008 +0000
     1.3 @@ -34,7 +34,3 @@
     1.4  				XEN_LOCKED_UNBLOCK_EVENTS(reg)		; \
     1.5      				XEN_PUT_VCPU_INFO(reg)
     1.6  #define XEN_TEST_PENDING(reg)	testb $0xFF,evtchn_upcall_pending(reg)
     1.7 -
     1.8 -VGCF_IN_SYSCALL = (1<<8)
     1.9 -        
    1.10 -	
     2.1 --- a/include/xen/interface/arch-x86/xen-x86_64.h	Tue Mar 18 11:13:37 2008 +0000
     2.2 +++ b/include/xen/interface/arch-x86/xen-x86_64.h	Tue Mar 18 11:16:03 2008 +0000
     2.3 @@ -97,8 +97,6 @@
     2.4  #define machine_to_phys_mapping ((unsigned long *)HYPERVISOR_VIRT_START)
     2.5  #endif
     2.6  
     2.7 -#ifndef __ASSEMBLY__
     2.8 -
     2.9  /*
    2.10   * int HYPERVISOR_set_segment_base(unsigned int which, unsigned long base)
    2.11   *  @which == SEGBASE_*  ;  @base == 64-bit base address
    2.12 @@ -133,6 +131,9 @@
    2.13  #define _VGCF_in_syscall 8
    2.14  #define VGCF_in_syscall  (1<<_VGCF_in_syscall)
    2.15  #define VGCF_IN_SYSCALL  VGCF_in_syscall
    2.16 +
    2.17 +#ifndef __ASSEMBLY__
    2.18 +
    2.19  struct iret_context {
    2.20      /* Top of stack (%rsp at point of hypercall). */
    2.21      uint64_t rax, r11, rcx, flags, rip, cs, rflags, rsp, ss;