2004-11-25 00:35:18

by Jeff Dike

[permalink] [raw]
Subject: [PATCH] UML - Remove a quilt-induced duplicity

This piece appears to have gone in twice.

Signed-off-by: Milton Miller <[email protected]>
Signed-off-by: Jeff Dike <[email protected]>

===== 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));