2 files changed, 3 insertions, 13 deletions

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index cc7c4ba0774d..96492cf2d491 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -270,14 +270,12 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long new_stackp,
         save_fp_regs(&current->thread.fp_regs);
         memcpy(&p->thread.fp_regs, &current->thread.fp_regs,
                sizeof(s390_fp_regs));
-        p->thread.user_seg = __pa((unsigned long) p->mm->pgd) | _SEGMENT_TABLE;
         /* Set a new TLS ?  */
         if (clone_flags & CLONE_SETTLS)
                 p->thread.acrs[0] = regs->gprs[6];
 #else /* CONFIG_64BIT */
         /* Save the fpu registers to new thread structure. */
         save_fp_regs(&p->thread.fp_regs);
-        p->thread.user_seg = __pa((unsigned long) p->mm->pgd) | _REGION_TABLE;
         /* Set a new TLS ?  */
         if (clone_flags & CLONE_SETTLS) {
                 if (test_thread_flag(TIF_31BIT)) {
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index 3b972d4c6b29..81efccc63942 100644
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -93,7 +93,6 @@ struct thread_struct {
         s390_fp_regs fp_regs;
         unsigned int  acrs[NUM_ACRS];
         unsigned long ksp;              /* kernel stack pointer             */
-        unsigned long user_seg;         /* HSTD                             */
         mm_segment_t mm_segment;
         unsigned long prot_addr;        /* address of protection-excep.     */
         unsigned int error_code;        /* error-code of last prog-excep.   */
@@ -134,16 +133,9 @@ struct stack_frame {
 # define __SWAPPER_PG_DIR __pa(&swapper_pg_dir[0]) + _REGION_TABLE
 #endif /* __s390x__ */
 
-#define INIT_THREAD {{0,{{0},{0},{0},{0},{0},{0},{0},{0},{0},{0},              \
-                            {0},{0},{0},{0},{0},{0}}},                         \
-                     {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},         \
-                     sizeof(init_stack) + (unsigned long) &init_stack,         \
-                     __SWAPPER_PG_DIR,                                         \
-                     {0},                                                      \
-                     0,0,0,                                                    \
-                     (per_struct) {{{{0,}}},0,0,0,0,{{0,}}},                   \
-                     0, 0                                                      \
-} 
+#define INIT_THREAD {                                                   \
+        .ksp = sizeof(init_stack) + (unsigned long) &init_stack,        \
+}
 
 /*
  * Do necessary setup to start up a new thread.