---

yaml --- r: 347346 b: refs/heads/master c: 2832bc1 h: refs/heads/master v: v3
git-mirror · Dec 20, 2012 · 72b1210 · 72b1210
1 parent 64b103b
commit 72b1210
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cda73a10eb3f493871ed39f468db50a65ebeddce
+refs/heads/master: 2832bc19f6668fd00116f61f821105040599ef8b
diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c
@@ -793,8 +793,11 @@ unsigned int sysctl_numa_balancing_scan_delay = 1000;
 
 static void task_numa_placement(struct task_struct *p)
 {
-	int seq = ACCESS_ONCE(p->mm->numa_scan_seq);
+	int seq;
 
+	if (!p->mm)	/* for example, ksmd faulting in a user's mm */
+		return;
+	seq = ACCESS_ONCE(p->mm->numa_scan_seq);
 	if (p->numa_scan_seq == seq)
 		return;
 	p->numa_scan_seq = seq;