* [uml-devel] [PATCH 3/11] UML - Simplify interval setting
@ 2007-09-19 17:02 ` Jeff Dike
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Dike @ 2007-09-19 17:02 UTC (permalink / raw)
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 <jdike@linux.intel.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 3/11] UML - Simplify interval setting
@ 2007-09-19 17:02 ` Jeff Dike
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Dike @ 2007-09-19 17:02 UTC (permalink / raw)
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 <jdike@linux.intel.com>
---
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-09-19 17:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-19 17:02 [uml-devel] [PATCH 3/11] UML - Simplify interval setting Jeff Dike
2007-09-19 17:02 ` Jeff Dike
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.