diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 21:56:19 +0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2010-04-26 21:56:19 +0400 |
| commit | 8ef1bb539203629f77a61976e4f25415e1083bff (patch) | |
| tree | 4fee25aca0928f112716fb02d27b1b355d0843b4 /kernel/fork.c | |
| parent | a3bcbbee83f55cbaec9b2ad748e7300c7feb2192 (diff) | |
| parent | b91ce4d14a21fc04d165be30319541e0f9204f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 4799c5f0e6d0..44b0791b0a2e 100644 --- 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; |