Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[cascardo/linux.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 3e1290b..cd3653e 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -464,13 +464,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
        priority = task_prio(task);
        nice = task_nice(task);
 
-       /* Temporary variable needed for gcc-2.96 */
-       /* convert timespec -> nsec*/
-       start_time =
-               (unsigned long long)task->real_start_time.tv_sec * NSEC_PER_SEC
-                               + task->real_start_time.tv_nsec;
        /* convert nsec -> ticks */
-       start_time = nsec_to_clock_t(start_time);
+       start_time = nsec_to_clock_t(task->real_start_time);
 
        seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state);
        seq_put_decimal_ll(m, ' ', ppid);