Merge commit 'v2.6.28-rc1' into sched/urgent

This commit is contained in:
Ingo Molnar
2008-10-24 12:48:46 +02:00
3411 changed files with 325467 additions and 53644 deletions

View File

@@ -449,6 +449,7 @@ static void update_curr(struct cfs_rq *cfs_rq)
struct task_struct *curtask = task_of(curr);
cpuacct_charge(curtask, delta_exec);
account_group_exec_runtime(curtask, delta_exec);
}
}