Merge branch 'linus' into perf/core

[linux-2.6-block.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index 4799c5f0e6d089a6287b7c7742a34f37146932c1..5d3592deaf71cab3a6dc47acaa38317738e15fee 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1052,6 +1052,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
        p->prev_utime = cputime_zero;
        p->prev_stime = cputime_zero;
 #endif
+#if defined(SPLIT_RSS_COUNTING)
+       memset(&p->rss_stat, 0, sizeof(p->rss_stat));
+#endif
 
        p->default_timer_slack_ns = current->timer_slack_ns;
 
@@ -1108,9 +1111,6 @@ static struct task_struct *copy_process(unsigned long clone_flags,
        p->memcg_batch.do_batch = 0;
        p->memcg_batch.memcg = NULL;
 #endif
-
-       p->bts = NULL;
-
        p->stack_start = stack_start;
 
        /* Perform scheduler related setup. Assign this task to a CPU. */