ia64/xen-unstable

changeset 6188:750b2a013d45

merge
author iap10@firebug.cl.cam.ac.uk
date Mon Aug 15 12:37:12 2005 +0000 (2005-08-15)
parents 5311d81c1e8e c42c85c6f590
children f2e0bbec3bf9
files linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_x86_64 linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h
line diff
     2.1 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h	Mon Aug 15 10:55:11 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h	Mon Aug 15 12:37:12 2005 +0000
     2.3 @@ -34,10 +34,10 @@ static inline void __prepare_arch_switch
     2.4  	 * are always kernel segments while inside the kernel. Must
     2.5  	 * happen before reload of cr3/ldt (i.e., not in __switch_to).
     2.6  	 */
     2.7 -	__asm__ __volatile__ ( "mov %%fs,%0 ; mov %%gs,%1"
     2.8 +	asm volatile ( "mov %%fs,%0 ; mov %%gs,%1"
     2.9  		: "=m" (*(int *)&current->thread.fs),
    2.10  		  "=m" (*(int *)&current->thread.gs));
    2.11 -	__asm__ __volatile__ ( "mov %0,%%fs ; mov %0,%%gs"
    2.12 +	asm volatile ( "mov %0,%%fs ; mov %0,%%gs"
    2.13  		: : "r" (0) );
    2.14  }
    2.15  
    2.16 @@ -100,7 +100,7 @@ static inline void switch_mm(struct mm_s
    2.17  }
    2.18  
    2.19  #define deactivate_mm(tsk, mm) \
    2.20 -	asm("mov %0,%%fs ; mov %0,%%gs": :"r" (0))
    2.21 +	asm("movl %0,%%fs ; movl %0,%%gs": :"r" (0))
    2.22  
    2.23  #define activate_mm(prev, next) \
    2.24  	switch_mm((prev),(next),NULL)