
From: Jeff Dike <jdike@addtoit.com>

This piece appears to have gone in twice.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/um/kernel/tt/trap_user.c |    7 -------
 1 files changed, 7 deletions(-)

diff -puN arch/um/kernel/tt/trap_user.c~uml-remove-a-quilt-induced-duplicity arch/um/kernel/tt/trap_user.c
--- 25/arch/um/kernel/tt/trap_user.c~uml-remove-a-quilt-induced-duplicity	2004-11-28 01:17:25.599196736 -0800
+++ 25-akpm/arch/um/kernel/tt/trap_user.c	2004-11-28 01:17:25.603196128 -0800
@@ -30,13 +30,6 @@ void sig_handler_common_tt(int sig, void
 	if(sig == SIGSEGV)
 		change_sig(SIGSEGV, 1);
 
-	/* This is done because to allow SIGSEGV to be delivered inside a SEGV
-	 * handler.  This can happen in copy_user, and if SEGV is disabled,
-	 * the process will die.
-	 */
-	if(sig == SIGSEGV)
-		change_sig(SIGSEGV, 1);
-
 	r = &TASK_REGS(get_current())->tt;
 	save_regs = *r;
 	is_user = user_context(SC_SP(sc));
_
