adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

uml: simplify interval setting

Browse source 
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>
This commit is contained in:
Jeff Dike 2007-10-16 01:27:22 -07:00 committed by Linus Torvalds
parent 181bde801a
commit a2f018bf38
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/um/include/os.h
View file

@ -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);

2
arch/um/kernel/time.c
View file

@ -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);

2
arch/um/os-Linux/skas/process.c
View file

@ -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);

5
arch/um/os-Linux/time.c
View file

@ -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;