1 files changed, 2 insertions, 5 deletions

diff --git a/fs/proc/array.c b/fs/proc/array.c
index df2b703b9d0f..5e4f776b0917 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -353,9 +353,6 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
         task_cap(m, task);
         task_cpus_allowed(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;
 }
@@ -492,8 +489,8 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                 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,