[PATCH] UML - Remove a quilt-induced duplicity

[Jeff Dike]

This piece appears to have gone in twice.

Signed-off-by: Milton Miller <miltonm@xxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>

===== arch/um/kernel/tt/trap_user.c 1.5 vs edited =====
Index: 2.6.9/arch/um/kernel/tt/trap_user.c
===================================================================
--- 2.6.9.orig/arch/um/kernel/tt/trap_user.c	2004-11-18 12:24:41.000000000 -0500
+++ 2.6.9/arch/um/kernel/tt/trap_user.c	2004-11-18 12:25:32.000000000 -0500
@@ -30,13 +30,6 @@
 	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));

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/