Commit a6f4e3cf authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: fix timer initialization

In skas mode, the call to uml_idle_timer permanently shut off the virtual
timer, resulting in no timer ticks to anything but the idle thread.  This is
likely the cause of the soft lockups that are seen sporadically in recent
UMLs.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e0877f07
...@@ -169,7 +169,7 @@ int current_pid(void) ...@@ -169,7 +169,7 @@ int current_pid(void)
void default_idle(void) void default_idle(void)
{ {
uml_idle_timer(); CHOOSE_MODE(uml_idle_timer(), (void) 0);
atomic_inc(&init_mm.mm_count); atomic_inc(&init_mm.mm_count);
current->mm = &init_mm; current->mm = &init_mm;
......
...@@ -180,7 +180,6 @@ int start_uml_skas(void) ...@@ -180,7 +180,6 @@ int start_uml_skas(void)
start_userspace(0); start_userspace(0);
init_new_thread_signals(1); init_new_thread_signals(1);
uml_idle_timer();
init_task.thread.request.u.thread.proc = start_kernel_proc; init_task.thread.request.u.thread.proc = start_kernel_proc;
init_task.thread.request.u.thread.arg = NULL; init_task.thread.request.u.thread.arg = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment