git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-i386
/
mach-xen
/
asm
/
mmu_context.h
diff --git
a/include/asm-i386/mach-xen/asm/mmu_context.h
b/include/asm-i386/mach-xen/asm/mmu_context.h
index
d3b50f7
..
dcd73f5
100644
(file)
--- a/
include/asm-i386/mach-xen/asm/mmu_context.h
+++ b/
include/asm-i386/mach-xen/asm/mmu_context.h
@@
-31,10
+31,9
@@
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).
*/
* 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"
- : "=m" (current->thread.fs),
- "=m" (current->thread.gs));
- asm volatile ( "movl %0,%%fs ; movl %0,%%gs"
+ asm volatile ( "mov %%fs,%0"
+ : "=m" (current->thread.fs));
+ asm volatile ( "movl %0,%%fs"
: : "r" (0) );
}
: : "r" (0) );
}
@@
-70,7
+69,7
@@
static inline void switch_mm(struct mm_struct *prev,
* load the LDT, if the LDT is different:
*/
if (unlikely(prev->context.ldt != next->context.ldt)) {
* load the LDT, if the LDT is different:
*/
if (unlikely(prev->context.ldt != next->context.ldt)) {
- /* load_LDT_nolock(&next->context
, cpu
) */
+ /* load_LDT_nolock(&next->context) */
op->cmd = MMUEXT_SET_LDT;
op->arg1.linear_addr = (unsigned long)next->context.ldt;
op->arg2.nr_ents = next->context.size;
op->cmd = MMUEXT_SET_LDT;
op->arg1.linear_addr = (unsigned long)next->context.ldt;
op->arg2.nr_ents = next->context.size;
@@
-89,14
+88,14
@@
static inline void switch_mm(struct mm_struct *prev,
* tlb flush IPI delivery. We must reload %cr3.
*/
load_cr3(next->pgd);
* tlb flush IPI delivery. We must reload %cr3.
*/
load_cr3(next->pgd);
- load_LDT_nolock(&next->context
, cpu
);
+ load_LDT_nolock(&next->context);
}
}
#endif
}
}
}
#endif
}
-#define deactivate_mm(tsk, mm) \
- asm("movl %0,%%fs
; movl %0,%%gs": :"r" (0))
+#define deactivate_mm(tsk, mm)
\
+ asm("movl %0,%%fs
": :"r" (0));
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{
static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
{