X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=fs%2Fproc%2Farray.c;h=dc4d1d0aa878ab453c835723fbf21f94b6340422;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=8e7277336259a117ce849a178bce80b70a98a00d;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 8e7277336..dc4d1d0aa 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -52,6 +52,7 @@
  *			 :  base.c too.
  */
 
+#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/time.h>
@@ -74,7 +75,9 @@
 #include <linux/times.h>
 #include <linux/cpuset.h>
 #include <linux/rcupdate.h>
-#include <linux/delayacct.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
@@ -400,8 +403,6 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
 	sigemptyset(&sigign);
 	sigemptyset(&sigcatch);
 	cutime = cstime = utime = stime = cputime_zero;
-
-	mutex_lock(&tty_mutex);
 	read_lock(&tasklist_lock);
 	if (task->sighand) {
 		spin_lock_irq(&task->sighand->siglock);
@@ -447,7 +448,6 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
 	pgid = vx_info_map_pid(task->vx_info, pgid);
 
 	read_unlock(&tasklist_lock);
-	mutex_unlock(&tty_mutex);
 
 	if (!whole || num_threads<2) {
 		wchan = 0;
@@ -487,7 +487,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
 
 	res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \
 %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
-%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu %llu\n",
+%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu\n",
 		pid,
 		tcomm,
 		state,
@@ -531,8 +531,7 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
 		task->exit_signal,
 		task_cpu(task),
 		task->rt_priority,
-		task->policy,
-		(unsigned long long)delayacct_blkio_ticks(task));
+		task->policy);
 	if(mm)
 		mmput(mm);
 	return res;