--- fs/proc/array.c

+++ fs/proc/array.c

@@ -172,7 +172,7 @@ static inline void task_state(struct seq

if (tracer)

tpid = task_pid_nr_ns(tracer, ns);

}

- cred = get_cred((struct cred *) __task_cred(p));

+ cred = get_task_cred(p);

seq_printf(m,

"State:\t%s\n"

"Tgid:\t%d\n"

@@ -336,9 +336,6 @@ int proc_pid_status(struct seq_file *m,

task_sig(m, task);

task_cap(m, task);

cpuset_task_status_allowed(m, task);

-#if defined(CONFIG_S390)

- task_show_regs(m, task);

-#endif

task_context_switch_counts(m, task);

return 0;

}

@@ -405,7 +402,6 @@ static int do_task_stat(struct seq_file

/* add up live thread stats at the group level */

if (whole) {

- struct task_cputime cputime;

struct task_struct *t = task;

do {

min_flt += t->min_flt;

@@ -416,9 +412,7 @@ static int do_task_stat(struct seq_file

min_flt += sig->min_flt;

maj_flt += sig->maj_flt;

- thread_group_cputime(task, &cputime);

- utime = cputime.utime;

- stime = cputime.stime;

+ thread_group_times(task, &utime, &stime);

gtime = cputime_add(gtime, sig->gtime);

}

@@ -479,8 +473,8 @@ static int do_task_stat(struct seq_file

vsize,

mm ? get_mm_rss(mm) : 0,

rsslim,

- mm ? mm->start_code : 0,

- mm ? mm->end_code : 0,

+ mm ? (permitted ? mm->start_code : 1) : 0,

+ mm ? (permitted ? mm->end_code : 1) : 0,

(permitted && mm) ? mm->start_stack : 0,

esp,

eip,