diff options
| author | iap10@firebug.cl.cam.ac.uk <iap10@firebug.cl.cam.ac.uk> | 2005-08-15 12:37:12 +0000 |
|---|---|---|
| committer | iap10@firebug.cl.cam.ac.uk <iap10@firebug.cl.cam.ac.uk> | 2005-08-15 12:37:12 +0000 |
| commit | f02c17a9fb55e948bcbd4ccc2d0b969c04200b9a (patch) | |
| tree | 150827fba8d7a040300674e5a02c87d494605a7c | |
| parent | 6db7983320240d04201ba538817673746cc0202a (diff) | |
| parent | d61d49705fc0b11a6f406c1954a7a25be0677d18 (diff) | |
| download | xen-f02c17a9fb55e948bcbd4ccc2d0b969c04200b9a.tar.gz xen-f02c17a9fb55e948bcbd4ccc2d0b969c04200b9a.tar.bz2 xen-f02c17a9fb55e948bcbd4ccc2d0b969c04200b9a.zip | |
merge
| -rw-r--r-- | linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h index f54bb7bdd7..477eccf6f5 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h @@ -34,10 +34,10 @@ static inline void __prepare_arch_switch(void) * are always kernel segments while inside the kernel. Must * happen before reload of cr3/ldt (i.e., not in __switch_to). */ - __asm__ __volatile__ ( "mov %%fs,%0 ; mov %%gs,%1" + asm volatile ( "mov %%fs,%0 ; mov %%gs,%1" : "=m" (*(int *)¤t->thread.fs), "=m" (*(int *)¤t->thread.gs)); - __asm__ __volatile__ ( "mov %0,%%fs ; mov %0,%%gs" + asm volatile ( "mov %0,%%fs ; mov %0,%%gs" : : "r" (0) ); } @@ -100,7 +100,7 @@ static inline void switch_mm(struct mm_struct *prev, } #define deactivate_mm(tsk, mm) \ - asm("mov %0,%%fs ; mov %0,%%gs": :"r" (0)) + asm("movl %0,%%fs ; movl %0,%%gs": :"r" (0)) #define activate_mm(prev, next) \ switch_mm((prev),(next),NULL) |