um: Remove sig_info[SIGALRM]

This entry is misleading, the actual signal handler is
another one that never uses sig_info.

Also remove the SIGALRM if inside sig_handler() for the
same reason.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.co.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Johannes Berg 2019-08-23 12:44:26 +02:00 committed by Richard Weinberger
parent d47761db97
commit 68c15a2bc5

View File

@ -26,7 +26,6 @@ void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
[SIGBUS] = bus_handler, [SIGBUS] = bus_handler,
[SIGSEGV] = segv_handler, [SIGSEGV] = segv_handler,
[SIGIO] = sigio_handler, [SIGIO] = sigio_handler,
[SIGALRM] = timer_handler
}; };
static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc) static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
@ -42,7 +41,7 @@ static void sig_handler_common(int sig, struct siginfo *si, mcontext_t *mc)
} }
/* enable signals if sig isn't IRQ signal */ /* enable signals if sig isn't IRQ signal */
if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGALRM)) if ((sig != SIGIO) && (sig != SIGWINCH))
unblock_signals(); unblock_signals();
(*sig_info[sig])(sig, si, &r); (*sig_info[sig])(sig, si, &r);