Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5c7e8b4 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: don't bother blocking SIGARLM and SIGUSR1 



We used to generate those, but we hadn't done that for a long
time.  No need to bother blocking them for signal handlers.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 9b25fcbd

arch/um/os-Linux/process.c

+6 −7
Original line number Diff line number Diff line
@@ -236,20 +236,19 @@ out: 
void init_new_thread_signals(void)

{

	set_handler(SIGSEGV, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);

		    SIGIO, SIGWINCH, SIGVTALRM, -1);

	set_handler(SIGTRAP, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);

		    SIGIO, SIGWINCH, SIGVTALRM, -1);

	set_handler(SIGFPE, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);

		    SIGIO, SIGWINCH, SIGVTALRM, -1);

	set_handler(SIGILL, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);

		    SIGIO, SIGWINCH, SIGVTALRM, -1);

	set_handler(SIGBUS, (__sighandler_t) sig_handler, SA_ONSTACK,

		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);

		    SIGIO, SIGWINCH, SIGVTALRM, -1);

	signal(SIGHUP, SIG_IGN);



	set_handler(SIGIO, (__sighandler_t) sig_handler,

		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM,

		    SIGVTALRM, -1);

		    SA_ONSTACK | SA_RESTART, SIGIO, SIGWINCH, SIGVTALRM, -1);

	signal(SIGWINCH, SIG_IGN);

	signal(SIGTERM, SIG_DFL);

}

arch/um/os-Linux/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void alarm_handler(int sig, struct sigcontext *sc) 
void timer_init(void)

{

	set_handler(SIGVTALRM, (__sighandler_t) alarm_handler,

		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, -1);

		    SA_ONSTACK | SA_RESTART, SIGIO, SIGWINCH, -1);

}



void set_sigstack(void *sig_stack, int size)

arch/um/os-Linux/skas/process.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int start_idle_thread(void *stack, jmp_buf *switch_buf) 
	int n;



	set_handler(SIGWINCH, (__sighandler_t) sig_handler,

		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGVTALRM, -1);

		    SA_ONSTACK | SA_RESTART, SIGIO, SIGVTALRM, -1);



	/*

	 * Can't use UML_SETJMP or UML_LONGJMP here because they save