From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 23 Aug 2019 10:44:26 +0000 (+0200)
Subject: um: Remove sig_info[SIGALRM]
X-Git-Tag: v5.4.17~2662^2~18
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=68c15a2bc56585e55732d45183ea4d636a83828a;p=arm%2Flinux.git

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>
---

diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c
index 75b10235d369..35d1b2bc00cb 100644
--- a/arch/um/os-Linux/signal.c
+++ b/arch/um/os-Linux/signal.c
@@ -26,7 +26,6 @@ void (*sig_info[NSIG])(int, struct siginfo *, struct uml_pt_regs *) = {
 	[SIGBUS]	= bus_handler,
 	[SIGSEGV]	= segv_handler,
 	[SIGIO]		= sigio_handler,
-	[SIGALRM]	= timer_handler
 };
 
 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 */
-	if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGALRM))
+	if ((sig != SIGIO) && (sig != SIGWINCH))
 		unblock_signals();
 
 	(*sig_info[sig])(sig, si, &r);