aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>2005-08-15 12:26:20 +0000
committervh249@arcadians.cl.cam.ac.uk <vh249@arcadians.cl.cam.ac.uk>2005-08-15 12:26:20 +0000
commitd61d49705fc0b11a6f406c1954a7a25be0677d18 (patch)
treecd734ec5fa342c6035a1cf770920237019b2e8b9
parent8f3a7366b2a696a1f5bca153ce2e7353eec1768c (diff)
downloadxen-d61d49705fc0b11a6f406c1954a7a25be0677d18.tar.gz
xen-d61d49705fc0b11a6f406c1954a7a25be0677d18.tar.bz2
xen-d61d49705fc0b11a6f406c1954a7a25be0677d18.zip
Small change to remove difference between Xen and mainline deactivate_mm.
While there, cleanup prepare_arch_switch as well. This generates identical code. Signed-off-by: Chris Wright <chrisw@osdl.org>
-rw-r--r--linux-2.6-xen-sparse/include/asm-xen/asm-i386/mmu_context.h6
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 *)&current->thread.fs),
"=m" (*(int *)&current->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)