summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/time.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 00:30:55 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-03-09 00:30:55 +0100
commitd15c22e78674f9a5bc0de0932a43abe1aafae303 (patch)
tree3e4198c44bd2d9184e91647346c66aa95e28f843 /arch/s390/kernel/time.c
parentInput: psmouse - add newline to OLPC HGPK touchpad debugging (diff)
parentLinux 2.6.29-rc7 (diff)
downloadlinux-d15c22e78674f9a5bc0de0932a43abe1aafae303.tar.xz
linux-d15c22e78674f9a5bc0de0932a43abe1aafae303.zip
Merge commit 'v2.6.29-rc7' into next
Diffstat (limited to 'arch/s390/kernel/time.c')
-rw-r--r--arch/s390/kernel/time.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index d649600df5b9..fc468cae4460 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -399,8 +399,10 @@ static struct workqueue_struct *time_sync_wq;
static void __init time_init_wq(void)
{
- if (!time_sync_wq)
- time_sync_wq = create_singlethread_workqueue("timesync");
+ if (time_sync_wq)
+ return;
+ time_sync_wq = create_singlethread_workqueue("timesync");
+ stop_machine_create();
}
/*