diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:27:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:08 -0700 |
| commit | a2f018bf389422a55f1455ab8b9b5eedc5ea1803 (patch) | |
| tree | 50f93a3c8892a89fbc981a7ac8d3566131f9fb84 /arch/um | |
| parent | 181bde801afae4304843ce95c868d4419ae87310 (diff) | |
| download | op-kernel-dev-a2f018bf389422a55f1455ab8b9b5eedc5ea1803.zip op-kernel-dev-a2f018bf389422a55f1455ab8b9b5eedc5ea1803.tar.gz | |
uml: simplify interval setting
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>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/include/os.h | 2 | ||||
| -rw-r--r-- | arch/um/kernel/time.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/skas/process.c | 2 | ||||
| -rw-r--r-- | arch/um/os-Linux/time.c | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 12de1ea..1897785 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -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); diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 633b673..2bda07dc 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -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); diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 5462469..0036164 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c @@ -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); diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index a16a0f4..b156f03 100644 --- a/arch/um/os-Linux/time.c +++ b/arch/um/os-Linux/time.c @@ -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; |
