aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/array.c
diff options
context:
space:
mode:
authorTomas Janousek <tjanouse@redhat.com>2007-07-16 02:39:42 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 12:05:41 -0400
commit924b42d5a2dbe508407a0a6290d3751f826bccdd (patch)
treec13a647ae93bcf033bddb713c1e117e84698c679 /fs/proc/array.c
parent7c3f1a573237b90ef331267260358a0ec4ac9079 (diff)
Use boot based time for process start time and boot time in /proc
Commit 411187fb05cd11676b0979d9fbf3291db69dbce2 caused boot time to move and process start times to become invalid after suspend. Using boot based time for those restores the old behaviour and fixes the issue. [akpm@linux-foundation.org: little cleanup] Signed-off-by: Tomas Janousek <tjanouse@redhat.com> Cc: Tomas Smetana <tsmetana@redhat.com> Acked-by: John Stultz <johnstul@us.ibm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/proc/array.c')
-rw-r--r--fs/proc/array.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 98e78e2f18d6..680c913575f0 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -440,8 +440,9 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
440 440
441 /* Temporary variable needed for gcc-2.96 */ 441 /* Temporary variable needed for gcc-2.96 */
442 /* convert timespec -> nsec*/ 442 /* convert timespec -> nsec*/
443 start_time = (unsigned long long)task->start_time.tv_sec * NSEC_PER_SEC 443 start_time =
444 + task->start_time.tv_nsec; 444 (unsigned long long)task->real_start_time.tv_sec * NSEC_PER_SEC
445 + task->real_start_time.tv_nsec;
445 /* convert nsec -> ticks */ 446 /* convert nsec -> ticks */
446 start_time = nsec_to_clock_t(start_time); 447 start_time = nsec_to_clock_t(start_time);
447 448