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

[linux-2.6.git] / kernel / posix-cpu-timers.c

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index 8e5d9a68b0222f0c028c42c059a39a736c636dba..6f7b869c011d8e4f817eb1d01e548c2def5c14a5 100644 (file)
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -224,7 +224,7 @@ static int cpu_clock_sample(const clockid_t which_clock, struct task_struct *p,
                cpu->cpu = virt_ticks(p);
                break;
        case CPUCLOCK_SCHED:
                cpu->cpu = virt_ticks(p);
                break;
        case CPUCLOCK_SCHED:

-               cpu->sched = p->se.sum_exec_runtime + task_delta_exec(p);
+               cpu->sched = task_sched_runtime(p);

                break;
        }
        return 0;
                break;
        }
        return 0;


@@ -305,18 +305,19 @@ static int cpu_clock_sample_group(const clockid_t which_clock,
 {
        struct task_cputime cputime;
 
 {
        struct task_cputime cputime;
 

-       thread_group_cputime(p, &cputime);

        switch (CPUCLOCK_WHICH(which_clock)) {
        default:
                return -EINVAL;
        case CPUCLOCK_PROF:
        switch (CPUCLOCK_WHICH(which_clock)) {
        default:
                return -EINVAL;
        case CPUCLOCK_PROF:

+               thread_group_cputime(p, &cputime);

                cpu->cpu = cputime_add(cputime.utime, cputime.stime);
                break;
        case CPUCLOCK_VIRT:
                cpu->cpu = cputime_add(cputime.utime, cputime.stime);
                break;
        case CPUCLOCK_VIRT:

+               thread_group_cputime(p, &cputime);

                cpu->cpu = cputime.utime;
                break;
        case CPUCLOCK_SCHED:
                cpu->cpu = cputime.utime;
                break;
        case CPUCLOCK_SCHED:

-               cpu->sched = cputime.sum_exec_runtime + task_delta_exec(p);
+               cpu->sched = thread_group_sched_runtime(p);

                break;
        }
        return 0;
                break;
        }
        return 0;