ia64/xen-unstable

changeset 5444:12cee45bc8c6

bitkeeper revision 1.1713.1.4 (42ada8c7SOk12pe5FJtQjpPwNus87g)

fix x86-64 compilation with CONFIG_SMP

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vh249@arcadians.cl.cam.ac.uk
date Mon Jun 13 15:39:51 2005 +0000 (2005-06-13)
parents 085461ee5cd6
children a382b5e24996
files linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S	Mon Jun 13 14:19:41 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S	Mon Jun 13 15:39:51 2005 +0000
     1.3 @@ -67,9 +67,9 @@ VGCF_IN_SYSCALL = (1<<8)
     1.4  #define preempt_disable(reg)	incl TI_preempt_count(reg)
     1.5  #define preempt_enable(reg)	decl TI_preempt_count(reg)
     1.6  #define XEN_LOCK_VCPU_INFO_SMP(reg) preempt_disable(%rbp)		; \
     1.7 -				movl TI_cpu(%rbp),reg			; \
     1.8 +				movq TI_cpu(%rbp),reg			; \
     1.9  				shl  $sizeof_vcpu_shift,reg		; \
    1.10 -				addl HYPERVISOR_shared_info,reg
    1.11 +				addq HYPERVISOR_shared_info,reg
    1.12  #define XEN_UNLOCK_VCPU_INFO_SMP(reg) preempt_enable(%rbp)
    1.13  #define XEN_UNLOCK_VCPU_INFO_SMP_fixup .byte 0xff,0xff,0xff
    1.14  #define Ux00 0xff
    1.15 @@ -80,7 +80,7 @@ VGCF_IN_SYSCALL = (1<<8)
    1.16  #define XEN_UNBLOCK_EVENTS(reg)	XEN_LOCK_VCPU_INFO_SMP(reg)		; \
    1.17  				movb $0,evtchn_upcall_mask(reg)		; \
    1.18      				XEN_UNLOCK_VCPU_INFO_SMP(reg)
    1.19 -#define XEN_SAVE_UPCALL_MASK(reg,tmp,off) GET_THREAD_INFO(%ebp)		; \
    1.20 +#define XEN_SAVE_UPCALL_MASK(reg,tmp,off) GET_THREAD_INFO(%rbp)		; \
    1.21  				XEN_LOCK_VCPU_INFO_SMP(reg)		; \
    1.22  				movb evtchn_upcall_mask(reg), tmp	; \
    1.23  				movb tmp, off(%rsp)			; \