diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-09-25 23:33:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 08:49:08 -0700 |
| commit | 537ae946e808d0f22d660f7a3500832fe0c07d14 (patch) | |
| tree | 843f9adaa3c7de8b10c51d0059e2b567d81ff566 /arch/um/include | |
| parent | 4b84c69b5f6c08a540e3683f1360a6cdef2806c7 (diff) | |
| download | kernel_samsung_espresso10-537ae946e808d0f22d660f7a3500832fe0c07d14.zip kernel_samsung_espresso10-537ae946e808d0f22d660f7a3500832fe0c07d14.tar.gz kernel_samsung_espresso10-537ae946e808d0f22d660f7a3500832fe0c07d14.tar.bz2 | |
[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>
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/os.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index c73dfa7..24fb6d8 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -276,9 +276,11 @@ extern int setjmp_wrapper(void (*proc)(void *, void *), ...); extern void switch_timers(int to_real); extern void idle_sleep(int secs); +extern int set_interval(int is_virtual); +#ifdef CONFIG_MODE_TT extern void enable_timer(void); +#endif extern void disable_timer(void); -extern void user_time_init(void); extern void uml_idle_timer(void); extern unsigned long long os_nsecs(void); |