Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933623AbXIMUnJ (ORCPT ); Thu, 13 Sep 2007 16:43:09 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761316AbXIMUmB (ORCPT ); Thu, 13 Sep 2007 16:42:01 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:60217 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757280AbXIMUl7 (ORCPT ); Thu, 13 Sep 2007 16:41:59 -0400 Date: Thu, 13 Sep 2007 16:41:11 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 2/3] UML - Remove called-once function Message-ID: <20070913204111.GA9986@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.3i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2842 Lines: 69 init_irq_signals doesn't need to be called from the context of a new process. It initializes handlers, which are useless in process context. With that call gone, init_irq_signals has only one caller, so it can be inlined into init_new_thread_signals. Index: linux-2.6.22/arch/um/include/os.h =================================================================== --- linux-2.6.22.orig/arch/um/include/os.h 2007-09-12 16:45:28.000000000 -0400 +++ linux-2.6.22/arch/um/include/os.h 2007-09-13 10:46:34.000000000 -0400 @@ -299,7 +299,6 @@ extern void os_free_irq_later(struct irq 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); Index: linux-2.6.22/arch/um/os-Linux/irq.c =================================================================== --- linux-2.6.22.orig/arch/um/os-Linux/irq.c 2007-09-12 16:44:34.000000000 -0400 +++ linux-2.6.22/arch/um/os-Linux/irq.c 2007-09-13 10:47:13.000000000 -0400 @@ -138,14 +138,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); -} Index: linux-2.6.22/arch/um/os-Linux/process.c =================================================================== --- linux-2.6.22.orig/arch/um/os-Linux/process.c 2007-09-12 16:44:34.000000000 -0400 +++ linux-2.6.22/arch/um/os-Linux/process.c 2007-09-13 10:46:34.000000000 -0400 @@ -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) Index: linux-2.6.22/arch/um/os-Linux/skas/process.c =================================================================== --- linux-2.6.22.orig/arch/um/os-Linux/skas/process.c 2007-09-13 10:45:15.000000000 -0400 +++ linux-2.6.22/arch/um/os-Linux/skas/process.c 2007-09-13 10:46:34.000000000 -0400 @@ -177,7 +177,6 @@ static int userspace_tramp(void *stack) ptrace(PTRACE_TRACEME, 0, 0, 0); - init_new_thread_signals(); err = set_interval(); if (err) panic("userspace_tramp - setting timer failed, errno = %d\n", - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/