From 8195b207ac0bd5eb2368989b821333f91c1b0897 Mon Sep 17 00:00:00 2001 From: KaiGai Kohei Date: Fri, 31 Mar 2006 02:30:45 -0800 Subject: [PATCH] --- yaml --- r: 24887 b: refs/heads/master c: bb231fe3a53b2d34c1aef119613816fcb18864b1 h: refs/heads/master i: 24885: aa29e8905c6527a16414ae883e4829bda508096a 24883: d1011ac8c0c37c860ca238b1c3fbfc887cac2f0d 24879: 666027a283a6417cb865292091b44a05c69e8bac v: v3 --- [refs] | 2 +- trunk/kernel/acct.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 61d5a6588db4..250cc12bce0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f79e2abb9bd452d97295f34376dedbec9686b986 +refs/heads/master: bb231fe3a53b2d34c1aef119613816fcb18864b1 diff --git a/trunk/kernel/acct.c b/trunk/kernel/acct.c index 065d8b4e51ef..b327f4d20104 100644 --- a/trunk/kernel/acct.c +++ b/trunk/kernel/acct.c @@ -449,8 +449,8 @@ static void do_acct_process(long exitcode, struct file *file) /* calculate run_time in nsec*/ do_posix_clock_monotonic_gettime(&uptime); run_time = (u64)uptime.tv_sec*NSEC_PER_SEC + uptime.tv_nsec; - run_time -= (u64)current->start_time.tv_sec*NSEC_PER_SEC - + current->start_time.tv_nsec; + run_time -= (u64)current->group_leader->start_time.tv_sec * NSEC_PER_SEC + + current->group_leader->start_time.tv_nsec; /* convert nsec -> AHZ */ elapsed = nsec_to_AHZ(run_time); #if ACCT_VERSION==3 @@ -469,10 +469,10 @@ static void do_acct_process(long exitcode, struct file *file) #endif do_div(elapsed, AHZ); ac.ac_btime = xtime.tv_sec - elapsed; - jiffies = cputime_to_jiffies(cputime_add(current->group_leader->utime, + jiffies = cputime_to_jiffies(cputime_add(current->utime, current->signal->utime)); ac.ac_utime = encode_comp_t(jiffies_to_AHZ(jiffies)); - jiffies = cputime_to_jiffies(cputime_add(current->group_leader->stime, + jiffies = cputime_to_jiffies(cputime_add(current->stime, current->signal->stime)); ac.ac_stime = encode_comp_t(jiffies_to_AHZ(jiffies)); /* we really need to bite the bullet and change layout */ @@ -522,9 +522,9 @@ static void do_acct_process(long exitcode, struct file *file) ac.ac_io = encode_comp_t(0 /* current->io_usage */); /* %% */ ac.ac_rw = encode_comp_t(ac.ac_io / 1024); ac.ac_minflt = encode_comp_t(current->signal->min_flt + - current->group_leader->min_flt); + current->min_flt); ac.ac_majflt = encode_comp_t(current->signal->maj_flt + - current->group_leader->maj_flt); + current->maj_flt); ac.ac_swaps = encode_comp_t(0); ac.ac_exitcode = exitcode;