Merge branch 'linus' into sched/core
Ingo Molnar [Thu, 15 Apr 2010 07:35:24 +0000 (09:35 +0200)]
Merge reason: merge the latest fixes, update to -rc4.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1  2 
kernel/cpu.c
kernel/cred.c
kernel/exit.c
kernel/sched.c
kernel/sched_debug.c

diff --cc kernel/cpu.c
Simple merge
diff --cc kernel/cred.c
Simple merge
diff --cc kernel/exit.c
Simple merge
diff --cc kernel/sched.c
Simple merge
@@@ -484,10 -491,31 +484,6 @@@ void proc_sched_show_task(struct task_s
  void proc_sched_set_task(struct task_struct *p)
  {
  #ifdef CONFIG_SCHEDSTATS
 -      p->se.wait_max                          = 0;
 -      p->se.wait_sum                          = 0;
 -      p->se.wait_count                        = 0;
 -      p->se.iowait_sum                        = 0;
 -      p->se.iowait_count                      = 0;
 -      p->se.sleep_max                         = 0;
 -      p->se.sum_sleep_runtime                 = 0;
 -      p->se.block_max                         = 0;
 -      p->se.exec_max                          = 0;
 -      p->se.slice_max                         = 0;
 -      p->se.nr_migrations                     = 0;
 -      p->se.nr_migrations_cold                = 0;
 -      p->se.nr_failed_migrations_affine       = 0;
 -      p->se.nr_failed_migrations_running      = 0;
 -      p->se.nr_failed_migrations_hot          = 0;
 -      p->se.nr_forced_migrations              = 0;
 -      p->se.nr_wakeups                        = 0;
 -      p->se.nr_wakeups_sync                   = 0;
 -      p->se.nr_wakeups_migrate                = 0;
 -      p->se.nr_wakeups_local                  = 0;
 -      p->se.nr_wakeups_remote                 = 0;
 -      p->se.nr_wakeups_affine                 = 0;
 -      p->se.nr_wakeups_affine_attempts        = 0;
 -      p->se.nr_wakeups_passive                = 0;
 -      p->se.nr_wakeups_idle                   = 0;
 -      p->sched_info.bkl_count                 = 0;
 +      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;
  }