Patch 2.6.32.28 to 2.6.32.32
/fs/proc/array.c
blob:f093fd8a46baf5967a023e580128a2c6dbccecfd -> blob:25fbc2019ec52e7a1177b158d6ddcae6adcaf4ac
--- 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_task_cred(p);
+ cred = get_cred((struct cred *) __task_cred(p));
seq_printf(m,
"State:\t%s\n"
"Tgid:\t%d\n"
@@ -336,6 +336,9 @@ 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;
}