[PATCH] hrtimer: use generic sleeper for nanosleep

[pandora-kernel.git] / kernel / acct.c

diff --git a/kernel/acct.c b/kernel/acct.c
index 6312d6b..b327f4d 100644 (file)
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -47,6 +47,7 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/acct.h>
+#include <linux/capability.h>
 #include <linux/file.h>
 #include <linux/tty.h>
 #include <linux/security.h>
@@ -427,6 +428,7 @@ static void do_acct_process(long exitcode, struct file *file)
        u64 elapsed;
        u64 run_time;
        struct timespec uptime;
+       unsigned long jiffies;
 
        /*
         * First check to see if there is enough free_space to continue
@@ -447,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
@@ -467,12 +469,12 @@ static void do_acct_process(long exitcode, struct file *file)
 #endif
        do_div(elapsed, AHZ);
        ac.ac_btime = xtime.tv_sec - elapsed;
-       ac.ac_utime = encode_comp_t(jiffies_to_AHZ(
-                                           current->signal->utime +
-                                           current->group_leader->utime));
-       ac.ac_stime = encode_comp_t(jiffies_to_AHZ(
-                                           current->signal->stime +
-                                           current->group_leader->stime));
+       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->stime,
+                                                current->signal->stime));
+       ac.ac_stime = encode_comp_t(jiffies_to_AHZ(jiffies));
        /* we really need to bite the bullet and change layout */
        ac.ac_uid = current->uid;
        ac.ac_gid = current->gid;
@@ -520,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;
 
@@ -580,7 +582,8 @@ void acct_process(long exitcode)
 void acct_update_integrals(struct task_struct *tsk)
 {
        if (likely(tsk->mm)) {
-               long delta = tsk->stime - tsk->acct_stimexpd;
+               long delta =
+                       cputime_to_jiffies(tsk->stime) - tsk->acct_stimexpd;
 
                if (delta == 0)
                        return;