Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934272AbXJSRVV (ORCPT ); Fri, 19 Oct 2007 13:21:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932069AbXJSRTy (ORCPT ); Fri, 19 Oct 2007 13:19:54 -0400 Received: from mtagate3.de.ibm.com ([195.212.29.152]:39456 "EHLO mtagate3.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762792AbXJSRTr (ORCPT ); Fri, 19 Oct 2007 13:19:47 -0400 Message-Id: <20071019171945.183678607@de.ibm.com> References: <20071019171857.430999834@de.ibm.com> User-Agent: quilt/0.46-1 Date: Fri, 19 Oct 2007 19:19:04 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Martin Schwidefsky Subject: [patch 07/10] Remove unused user_seg from thread structure. Content-Disposition: inline; filename=007-mm-userseg.diff Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2821 Lines: 72 From: Martin Schwidefsky Signed-off-by: Martin Schwidefsky --- arch/s390/kernel/process.c | 2 -- include/asm-s390/processor.h | 14 +++----------- 2 files changed, 3 insertions(+), 13 deletions(-) Index: quilt-2.6/arch/s390/kernel/process.c =================================================================== --- quilt-2.6.orig/arch/s390/kernel/process.c +++ quilt-2.6/arch/s390/kernel/process.c @@ -270,14 +270,12 @@ int copy_thread(int nr, unsigned long cl save_fp_regs(¤t->thread.fp_regs); memcpy(&p->thread.fp_regs, ¤t->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)) { Index: quilt-2.6/include/asm-s390/processor.h =================================================================== --- quilt-2.6.orig/include/asm-s390/processor.h +++ quilt-2.6/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. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/