From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from sc8-sf-mx2-b.sourceforge.net ([10.3.1.92] helo=mail.sourceforge.net) by sc8-sf-list1-new.sourceforge.net with esmtp (Exim 4.43) id 1IY2wW-0006Oe-NF for user-mode-linux-devel@lists.sourceforge.net; Wed, 19 Sep 2007 10:02:28 -0700 Received: from saraswathi.solana.com ([198.99.130.12]) by mail.sourceforge.net with esmtps (TLSv1:AES256-SHA:256) (Exim 4.44) id 1IY2wU-0003tu-34 for user-mode-linux-devel@lists.sourceforge.net; Wed, 19 Sep 2007 10:02:28 -0700 Date: Wed, 19 Sep 2007 13:02:23 -0400 From: Jeff Dike Message-ID: <20070919170223.GA10171@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Disposition: inline Subject: [uml-devel] [PATCH 3/11] UML - Simplify interval setting List-Id: The user-mode Linux development list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: user-mode-linux-devel-bounces@lists.sourceforge.net Errors-To: user-mode-linux-devel-bounces@lists.sourceforge.net To: Andrew Morton Cc: LKML , uml-devel set_interval took a timer type as an argument, but it always specified a virtual timer. So, it is not needed, and it is gone, and set_interval is simplified appropriately. Signed-off-by: Jeff Dike --- arch/um/include/os.h | 2 +- arch/um/kernel/time.c | 2 +- arch/um/os-Linux/skas/process.c | 2 +- arch/um/os-Linux/time.c | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) Index: linux-2.6.20/arch/um/include/os.h =================================================================== --- linux-2.6.20.orig/arch/um/include/os.h 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/include/os.h 2007-09-19 12:25:05.000000000 -0400 @@ -252,7 +252,7 @@ extern void os_dump_core(void); extern int switch_timers(int to_real); extern void idle_sleep(int secs); -extern int set_interval(int is_virtual); +extern int set_interval(void); extern void disable_timer(void); extern void uml_idle_timer(void); extern unsigned long long os_nsecs(void); Index: linux-2.6.20/arch/um/kernel/time.c =================================================================== --- linux-2.6.20.orig/arch/um/kernel/time.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/kernel/time.c 2007-09-19 12:25:05.000000000 -0400 @@ -102,7 +102,7 @@ static void register_timer(void) printk(KERN_ERR "register_timer : request_irq failed - " "errno = %d\n", -err); - err = set_interval(1); + err = set_interval(); if (err != 0) printk(KERN_ERR "register_timer : set_interval failed - " "errno = %d\n", -err); Index: linux-2.6.20/arch/um/os-Linux/skas/process.c =================================================================== --- linux-2.6.20.orig/arch/um/os-Linux/skas/process.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/os-Linux/skas/process.c 2007-09-19 12:25:05.000000000 -0400 @@ -178,7 +178,7 @@ static int userspace_tramp(void *stack) ptrace(PTRACE_TRACEME, 0, 0, 0); init_new_thread_signals(); - err = set_interval(1); + err = set_interval(); if (err) panic("userspace_tramp - setting timer failed, errno = %d\n", err); Index: linux-2.6.20/arch/um/os-Linux/time.c =================================================================== --- linux-2.6.20.orig/arch/um/os-Linux/time.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/os-Linux/time.c 2007-09-19 12:25:05.000000000 -0400 @@ -14,14 +14,13 @@ static int is_real_timer = 0; -int set_interval(int is_virtual) +int set_interval(void) { int usec = 1000000/UM_HZ; - int timer_type = is_virtual ? ITIMER_VIRTUAL : ITIMER_REAL; struct itimerval interval = ((struct itimerval) { { 0, usec }, { 0, usec } }); - if (setitimer(timer_type, &interval, NULL) == -1) + if (setitimer(ITIMER_VIRTUAL, &interval, NULL) == -1) return -errno; return 0; ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ User-mode-linux-devel mailing list User-mode-linux-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752748AbXISREz (ORCPT ); Wed, 19 Sep 2007 13:04:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762106AbXISRDR (ORCPT ); Wed, 19 Sep 2007 13:03:17 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:53165 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760311AbXISRDI (ORCPT ); Wed, 19 Sep 2007 13:03:08 -0400 Date: Wed, 19 Sep 2007 13:02:23 -0400 From: Jeff Dike To: Andrew Morton Cc: LKML , uml-devel Subject: [PATCH 3/11] UML - Simplify interval setting Message-ID: <20070919170223.GA10171@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 set_interval took a timer type as an argument, but it always specified a virtual timer. So, it is not needed, and it is gone, and set_interval is simplified appropriately. Signed-off-by: Jeff Dike --- arch/um/include/os.h | 2 +- arch/um/kernel/time.c | 2 +- arch/um/os-Linux/skas/process.c | 2 +- arch/um/os-Linux/time.c | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) Index: linux-2.6.20/arch/um/include/os.h =================================================================== --- linux-2.6.20.orig/arch/um/include/os.h 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/include/os.h 2007-09-19 12:25:05.000000000 -0400 @@ -252,7 +252,7 @@ extern void os_dump_core(void); extern int switch_timers(int to_real); extern void idle_sleep(int secs); -extern int set_interval(int is_virtual); +extern int set_interval(void); extern void disable_timer(void); extern void uml_idle_timer(void); extern unsigned long long os_nsecs(void); Index: linux-2.6.20/arch/um/kernel/time.c =================================================================== --- linux-2.6.20.orig/arch/um/kernel/time.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/kernel/time.c 2007-09-19 12:25:05.000000000 -0400 @@ -102,7 +102,7 @@ static void register_timer(void) printk(KERN_ERR "register_timer : request_irq failed - " "errno = %d\n", -err); - err = set_interval(1); + err = set_interval(); if (err != 0) printk(KERN_ERR "register_timer : set_interval failed - " "errno = %d\n", -err); Index: linux-2.6.20/arch/um/os-Linux/skas/process.c =================================================================== --- linux-2.6.20.orig/arch/um/os-Linux/skas/process.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/os-Linux/skas/process.c 2007-09-19 12:25:05.000000000 -0400 @@ -178,7 +178,7 @@ static int userspace_tramp(void *stack) ptrace(PTRACE_TRACEME, 0, 0, 0); init_new_thread_signals(); - err = set_interval(1); + err = set_interval(); if (err) panic("userspace_tramp - setting timer failed, errno = %d\n", err); Index: linux-2.6.20/arch/um/os-Linux/time.c =================================================================== --- linux-2.6.20.orig/arch/um/os-Linux/time.c 2007-09-19 12:25:05.000000000 -0400 +++ linux-2.6.20/arch/um/os-Linux/time.c 2007-09-19 12:25:05.000000000 -0400 @@ -14,14 +14,13 @@ static int is_real_timer = 0; -int set_interval(int is_virtual) +int set_interval(void) { int usec = 1000000/UM_HZ; - int timer_type = is_virtual ? ITIMER_VIRTUAL : ITIMER_REAL; struct itimerval interval = ((struct itimerval) { { 0, usec }, { 0, usec } }); - if (setitimer(timer_type, &interval, NULL) == -1) + if (setitimer(ITIMER_VIRTUAL, &interval, NULL) == -1) return -errno; return 0;