diff options
| author | Jeff Dike | 2005-06-25 23:55:24 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-06-26 01:24:35 +0200 |
| commit | fc47a0d18a1994b4a18d2235fcde1b75dfa72552 (patch) | |
| tree | fd551126b4ae4a4a6e9be99773cf04a7eacc4b72 /arch/um/kernel/time_kern.c | |
| parent | [PATCH] uml: always disable kmalloc during shutdown (diff) | |
| download | kernel-qcow2-linux-fc47a0d18a1994b4a18d2235fcde1b75dfa72552.tar.gz kernel-qcow2-linux-fc47a0d18a1994b4a18d2235fcde1b75dfa72552.tar.xz kernel-qcow2-linux-fc47a0d18a1994b4a18d2235fcde1b75dfa72552.zip | |
[PATCH] uml: time initialization tidying
user_time_init_skas and user_time_init_tt were essentially the same. So, this
merges them, deleting the mode-specific functions and declarations.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um/kernel/time_kern.c')
| -rw-r--r-- | arch/um/kernel/time_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c index 6516fc52afe0..a8b4ef601f59 100644 --- a/arch/um/kernel/time_kern.c +++ b/arch/um/kernel/time_kern.c @@ -162,7 +162,7 @@ int __init timer_init(void) { int err; - CHOOSE_MODE(user_time_init_tt(), user_time_init_skas()); + user_time_init(); err = request_irq(TIMER_IRQ, um_timer, SA_INTERRUPT, "timer", NULL); if(err != 0) printk(KERN_ERR "timer_init : request_irq failed - " |