[Xen-changelog] fix x86-64 compilation with CONFIG_SMP

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1717, 2005/06/13 16:39:51+01:00, vh249@xxxxxxxxxxxxxxxxxxxxxx

        fix x86-64 compilation with CONFIG_SMP
        
        Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>



 entry.S |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S 
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S    2005-06-13 
19:03:19 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S    2005-06-13 
19:03:19 -04:00
@@ -67,9 +67,9 @@
 #define preempt_disable(reg)   incl TI_preempt_count(reg)
 #define preempt_enable(reg)    decl TI_preempt_count(reg)
 #define XEN_LOCK_VCPU_INFO_SMP(reg) preempt_disable(%rbp)              ; \
-                               movl TI_cpu(%rbp),reg                   ; \
+                               movq TI_cpu(%rbp),reg                   ; \
                                shl  $sizeof_vcpu_shift,reg             ; \
-                               addl HYPERVISOR_shared_info,reg
+                               addq HYPERVISOR_shared_info,reg
 #define XEN_UNLOCK_VCPU_INFO_SMP(reg) preempt_enable(%rbp)
 #define XEN_UNLOCK_VCPU_INFO_SMP_fixup .byte 0xff,0xff,0xff
 #define Ux00 0xff
@@ -80,7 +80,7 @@
 #define XEN_UNBLOCK_EVENTS(reg)        XEN_LOCK_VCPU_INFO_SMP(reg)             
; \
                                movb $0,evtchn_upcall_mask(reg)         ; \
                                XEN_UNLOCK_VCPU_INFO_SMP(reg)
-#define XEN_SAVE_UPCALL_MASK(reg,tmp,off) GET_THREAD_INFO(%ebp)                
; \
+#define XEN_SAVE_UPCALL_MASK(reg,tmp,off) GET_THREAD_INFO(%rbp)                
; \
                                XEN_LOCK_VCPU_INFO_SMP(reg)             ; \
                                movb evtchn_upcall_mask(reg), tmp       ; \
                                movb tmp, off(%rsp)                     ; \

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog