From 096b1bf950e52872d9724e2f987b7d0a7cefe9ed Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 4 Feb 2008 22:31:16 -0800
Subject: [PATCH] --- yaml --- r: 83215 b: refs/heads/master c:
 3a24ebf0cb2ca44fdcdb5cae9ed2e778e5170f97 h: refs/heads/master i:   83213:
 2280b95aba20b48963af1670bc1c696cdd1e0167   83211:
 2b210b51d23cb8b9fd3b40e69081ee58b6503e6e   83207:
 ee9bb4de9519481eb245ec23317b06a10eff493f   83199:
 c9fbca14f9a8d49316d64b6916c94aaf8f730ebc v: v3

---
 [refs]                           |  2 +-
 trunk/arch/um/include/os.h       |  1 -
 trunk/arch/um/os-Linux/irq.c     | 11 -----------
 trunk/arch/um/os-Linux/process.c |  5 ++++-
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 98803640a300..62618e5dab69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfef8f34e7cf57f3d278ceda79c85112dec13dc6
+refs/heads/master: 3a24ebf0cb2ca44fdcdb5cae9ed2e778e5170f97
diff --git a/trunk/arch/um/include/os.h b/trunk/arch/um/include/os.h
index b9779ac5e5d7..0b6b62733303 100644
--- a/trunk/arch/um/include/os.h
+++ b/trunk/arch/um/include/os.h
@@ -285,7 +285,6 @@ extern void os_free_irq_later(struct irq_fd *active_fds,
 extern int os_get_pollfd(int i);
 extern void os_set_pollfd(int i, int fd);
 extern void os_set_ioignore(void);
-extern void init_irq_signals(int on_sigstack);
 
 /* sigio.c */
 extern int add_sigio_fd(int fd);
diff --git a/trunk/arch/um/os-Linux/irq.c b/trunk/arch/um/os-Linux/irq.c
index 430866ca1ce4..0348b975e81c 100644
--- a/trunk/arch/um/os-Linux/irq.c
+++ b/trunk/arch/um/os-Linux/irq.c
@@ -136,14 +136,3 @@ void os_set_ioignore(void)
 {
 	signal(SIGIO, SIG_IGN);
 }
-
-void init_irq_signals(int on_sigstack)
-{
-	int flags;
-
-	flags = on_sigstack ? SA_ONSTACK : 0;
-
-	set_handler(SIGIO, (__sighandler_t) sig_handler, flags | SA_RESTART,
-		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
-	signal(SIGWINCH, SIG_IGN);
-}
diff --git a/trunk/arch/um/os-Linux/process.c b/trunk/arch/um/os-Linux/process.c
index bda5c3150d6c..abf6beae3df1 100644
--- a/trunk/arch/um/os-Linux/process.c
+++ b/trunk/arch/um/os-Linux/process.c
@@ -249,7 +249,10 @@ void init_new_thread_signals(void)
 		    SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
 	signal(SIGHUP, SIG_IGN);
 
-	init_irq_signals(1);
+	set_handler(SIGIO, (__sighandler_t) sig_handler,
+		    SA_ONSTACK | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGALRM,
+		    SIGVTALRM, -1);
+	signal(SIGWINCH, SIG_IGN);
 }
 
 int run_kernel_thread(int (*fn)(void *), void *arg, jmp_buf **jmp_ptr)