Merge penguin:v2.5/linux

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge penguin:v2.5/linux
into home.transmeta.com:/home/torvalds/v2.5/linux
c4fbc32d · Linus Torvalds · a3a71a19 · 2cc9d020 · c4fbc32d
Commit c4fbc32d authored Feb 04, 2003 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

fs/proc/proc_misc.c fs/proc/proc_misc.c +1 -2

No files found.
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -121,8 +121,7 @@ static int uptime_read_proc(char *page, char **start, off_t off,
 	}
 #else
 	{
-		unsigned long idle = init_task.times.tms_utime
+		unsigned long idle = init_task.utime + init_task.stime;
-		                     + init_task.times.tms_stime;
 		len = sprintf(page,"%lu.%02lu %lu.%02lu\n",
 			(unsigned long) uptime,