summaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/time_kern.c
diff options
context:
space:
mode:
authorJeff Dike2006-05-04 04:55:03 +0200
committerLinus Torvalds2006-05-04 05:05:40 +0200
commit6760da0197a6ee327a09dafc070b26e2f02651fe (patch)
treed46d67012dda04b679e1d62179e89906a9edea72 /arch/um/kernel/time_kern.c
parent[PATCH] Remove wrong cpu_has_apic checks that came from mismerging (diff)
downloadkernel-qcow2-linux-6760da0197a6ee327a09dafc070b26e2f02651fe.tar.gz
kernel-qcow2-linux-6760da0197a6ee327a09dafc070b26e2f02651fe.tar.xz
kernel-qcow2-linux-6760da0197a6ee327a09dafc070b26e2f02651fe.zip
[PATCH] uml: change timer initialization
inet_init, which schedules, is called before the UML timer_init, which sets up the timer. The result is the interval timers being manipulated before the appropriate signal handlers are established, causing unhandled timers. This is fixed by making timer_init be called earlier. 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/kernel/time_kern.c')
-rw-r--r--arch/um/kernel/time_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 3c7626cdba4b..528cf623f8b4 100644
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -209,4 +209,4 @@ int __init timer_init(void)
return(0);
}
-__initcall(timer_init);
+arch_initcall(timer_init);