platform/x86: intel_menlow: switch to use <linux/units.h> helpers

[linux-2.6-microblaze.git] / kernel / tsacct.c

diff --git a/kernel/tsacct.c b/kernel/tsacct.c
index 7be3e75..257ffb9 100644 (file)
--- a/kernel/tsacct.c
+++ b/kernel/tsacct.c
@@ -24,6 +24,7 @@ void bacct_add_tsk(struct user_namespace *user_ns,
        const struct cred *tcred;
        u64 utime, stime, utimescaled, stimescaled;
        u64 delta;
+       time64_t btime;
 
        BUILD_BUG_ON(TS_COMM_LEN < TASK_COMM_LEN);
 
@@ -32,9 +33,11 @@ void bacct_add_tsk(struct user_namespace *user_ns,
        /* Convert to micro seconds */
        do_div(delta, NSEC_PER_USEC);
        stats->ac_etime = delta;
-       /* Convert to seconds for btime */
-       do_div(delta, USEC_PER_SEC);
-       stats->ac_btime = get_seconds() - delta;
+       /* Convert to seconds for btime (note y2106 limit) */
+       btime = ktime_get_real_seconds() - div_u64(delta, USEC_PER_SEC);
+       stats->ac_btime = clamp_t(time64_t, btime, 0, U32_MAX);
+       stats->ac_btime64 = btime;
+
        if (thread_group_leader(tsk)) {
                stats->ac_exitcode = tsk->exit_code;
                if (tsk->flags & PF_FORKNOEXEC)