[PATCH] uml: timer cleanups
set_interval returns an error instead of panicing if setitimer fails. Some of its callers now check the return. enable_timer is largely tt-mode-specific, so it is marked as such, and the only skas-mode caller is made to call set-interval instead. user_time_init was a no-value-added wrapper around set_interval, so it is gone. Since set_interval is now called from kernel code, callers no longer pass ITIMER_* to it. Instead, they pass a flag which is converted into ITIMER_REAL or ITIMER_VIRTUAL. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
committed by
Linus Torvalds
parent
4b84c69b5f
commit
537ae946e8
@@ -113,12 +113,15 @@ static void register_timer(void)
|
||||
|
||||
err = request_irq(TIMER_IRQ, um_timer, IRQF_DISABLED, "timer", NULL);
|
||||
if(err != 0)
|
||||
printk(KERN_ERR "timer_init : request_irq failed - "
|
||||
printk(KERN_ERR "register_timer : request_irq failed - "
|
||||
"errno = %d\n", -err);
|
||||
|
||||
timer_irq_inited = 1;
|
||||
|
||||
user_time_init();
|
||||
err = set_interval(1);
|
||||
if(err != 0)
|
||||
printk(KERN_ERR "register_timer : set_interval failed - "
|
||||
"errno = %d\n", -err);
|
||||
}
|
||||
|
||||
extern void (*late_time_init)(void);
|
||||
|
Reference in New Issue
Block a user