summaryrefslogtreecommitdiff
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 16:15:57 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-17 16:15:57 +1100
commitde8fdfbee55bdebd048ec45854c9c0fc30240c7f (patch)
tree3c193ea8ced47b9018eb3bd1a73956d2b9d564fd /kernel/sched/core.c
parent6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (diff)
parent171cef6d6ec6c1b4e95f2053545b2dd91931518b (diff)
Merge branch 'akpm/master'
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 34e2291a9a6c..c7ded3311ec4 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2844,7 +2844,7 @@ context_switch(struct rq *rq, struct task_struct *prev,
if (!mm) {
next->active_mm = oldmm;
- atomic_inc(&oldmm->mm_count);
+ mmgrab(oldmm);
enter_lazy_tlb(oldmm, next);
} else
switch_mm_irqs_off(oldmm, mm, next);
@@ -6095,7 +6095,7 @@ void __init sched_init(void)
/*
* The boot idle thread does lazy MMU switching as well:
*/
- atomic_inc(&init_mm.mm_count);
+ mmgrab(&init_mm);
enter_lazy_tlb(&init_mm, current);
/*