projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[powerpc.git]
/
include
/
asm-i386
/
mmu_context.h
diff --git
a/include/asm-i386/mmu_context.h
b/include/asm-i386/mmu_context.h
index
62b7bf1
..
e6aa30f
100644
(file)
--- a/
include/asm-i386/mmu_context.h
+++ b/
include/asm-i386/mmu_context.h
@@
-44,7
+44,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);
}
#ifdef CONFIG_SMP
else {
}
#ifdef CONFIG_SMP
else {
@@
-56,14
+56,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,%%
gs": :"r" (0));
#define activate_mm(prev, next) \
switch_mm((prev),(next),NULL)
#define activate_mm(prev, next) \
switch_mm((prev),(next),NULL)