diff --git a/[refs] b/[refs] index 419ed565b948..33091b7ef40f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e05606d3301525aa67b081ad9fccade2b31ab35a +refs/heads/master: 62480d13d5d1812176e969a47e2db78a5398d02e diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 74f30e0c0381..3df644313f9b 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -165,7 +165,6 @@ static inline char * task_state(struct task_struct *p, char *buffer) rcu_read_lock(); buffer += sprintf(buffer, "State:\t%s\n" - "SleepAVG:\t%lu%%\n" "Tgid:\t%d\n" "Pid:\t%d\n" "PPid:\t%d\n" @@ -173,7 +172,6 @@ static inline char * task_state(struct task_struct *p, char *buffer) "Uid:\t%d\t%d\t%d\t%d\n" "Gid:\t%d\t%d\t%d\t%d\n", get_task_state(p), - (p->sleep_avg/1024)*100/(1020000000/1024), p->tgid, p->pid, pid_alive(p) ? rcu_dereference(p->real_parent)->tgid : 0, pid_alive(p) && p->ptrace ? rcu_dereference(p->parent)->pid : 0,