[1/4] arch: um: remove sig_info[SIGALRM]
diff mbox series

Message ID 20190823104429.11047-1-johannes@sipsolutions.net
State Accepted
Headers show
Series
  • [1/4] arch: um: remove sig_info[SIGALRM]
Related show

Commit Message

Johannes Berg Aug. 23, 2019, 10:44 a.m. UTC
From: Johannes Berg <johannes.berg@intel.com>

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>
---
 arch/um/os-Linux/signal.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Anton Ivanov Aug. 27, 2019, 5:27 a.m. UTC | #1
On 23/08/2019 11:44, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> 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>
> ---
>   arch/um/os-Linux/signal.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> 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);
>

Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.co.uk>

Patch
diff mbox series

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