From 1d5e646360d2d5662615aceac1a957dcff3bff3e Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 22 Oct 2007 12:52:45 +0200
Subject: [PATCH] --- yaml --- r: 72119 b: refs/heads/master c:
 6f3fa3f0eb8fe4675f8543dd4be3365577e1d487 h: refs/heads/master i:   72117:
 17125a397a0a2af60180de2aed2d92582fad66d3   72115:
 93df6ce96d98731c1aa74c2bf31c31bc9aa3dd5f   72111:
 08e645f19aab7e106624d28ced292ef0cdfbaea1 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/s390/kernel/process.c   |  2 --
 trunk/include/asm-s390/processor.h | 14 +++-----------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 2d37afed70d5..0dd44bab0de2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba8a9229ab9e80278c28ad68b15053f65b2b0a7c
+refs/heads/master: 6f3fa3f0eb8fe4675f8543dd4be3365577e1d487
diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c
index cc7c4ba0774d..96492cf2d491 100644
--- a/trunk/arch/s390/kernel/process.c
+++ b/trunk/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/trunk/include/asm-s390/processor.h b/trunk/include/asm-s390/processor.h
index 3b972d4c6b29..81efccc63942 100644
--- a/trunk/include/asm-s390/processor.h
+++ b/trunk/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.