|
@@ -33,7 +33,7 @@
|
|
|
#include <linux/init.h>
|
|
|
#include <linux/uaccess.h>
|
|
|
#include <linux/highmem.h>
|
|
|
-#include <asm/mmu_context.h>
|
|
|
+#include <linux/mmu_context.h>
|
|
|
#include <linux/interrupt.h>
|
|
|
#include <linux/capability.h>
|
|
|
#include <linux/completion.h>
|
|
@@ -2733,7 +2733,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
|
|
|
atomic_inc(&oldmm->mm_count);
|
|
|
enter_lazy_tlb(oldmm, next);
|
|
|
} else
|
|
|
- switch_mm(oldmm, mm, next);
|
|
|
+ switch_mm_irqs_off(oldmm, mm, next);
|
|
|
|
|
|
if (!prev->mm) {
|
|
|
prev->active_mm = NULL;
|
|
@@ -5274,7 +5274,7 @@ void idle_task_exit(void)
|
|
|
BUG_ON(cpu_online(smp_processor_id()));
|
|
|
|
|
|
if (mm != &init_mm) {
|
|
|
- switch_mm(mm, &init_mm, current);
|
|
|
+ switch_mm_irqs_off(mm, &init_mm, current);
|
|
|
finish_arch_post_lock_switch();
|
|
|
}
|
|
|
mmdrop(mm);
|