diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:35:24 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 09:36:16 +0200 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /kernel/sched_debug.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
| download | linux-stable-b257c14ceb1194a6181144210056d38f22127189.tar.gz linux-stable-b257c14ceb1194a6181144210056d38f22127189.tar.bz2 linux-stable-b257c14ceb1194a6181144210056d38f22127189.zip | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_debug.c')
| -rw-r--r-- | kernel/sched_debug.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c index 0932c5c45b34..9cf1baf6616a 100644 --- a/kernel/sched_debug.c +++ b/kernel/sched_debug.c @@ -486,8 +486,4 @@ void proc_sched_set_task(struct task_struct *p) #ifdef CONFIG_SCHEDSTATS memset(&p->se.statistics, 0, sizeof(p->se.statistics)); #endif - p->se.sum_exec_runtime = 0; - p->se.prev_sum_exec_runtime = 0; - p->nvcsw = 0; - p->nivcsw = 0; } |