Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f3901b84d217657ec55f4d265556ad1e5d561bd7..ead464a0f2e5dfc71a0c0df16a9823f3677f847a 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2220,6 +2220,9 @@ static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
        INIT_HLIST_HEAD(&p->preempt_notifiers);
 #endif
 
+#ifdef CONFIG_COMPACTION
+       p->capture_control = NULL;
+#endif
        init_numa_balancing(clone_flags, p);
 }