summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorIngo Molnar2010-05-08 18:11:19 +0200
committerIngo Molnar2010-05-08 18:11:19 +0200
commite7858f52a5cb868289a72264534a1f05f3340c6c (patch)
treeaa7308603cf30d8aec6e45ecaddc6c8ed29d2edb /arch/s390
parentsched: Remove rq argument to the tracepoints (diff)
parentcpu_stop: add dummy implementation for UP (diff)
downloadkernel-qcow2-linux-e7858f52a5cb868289a72264534a1f05f3340c6c.tar.gz
kernel-qcow2-linux-e7858f52a5cb868289a72264534a1f05f3340c6c.tar.xz
kernel-qcow2-linux-e7858f52a5cb868289a72264534a1f05f3340c6c.zip
Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/time.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index d906bf19c14a..a2163c95eb98 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -391,7 +391,6 @@ static void __init time_init_wq(void)
if (time_sync_wq)
return;
time_sync_wq = create_singlethread_workqueue("timesync");
- stop_machine_create();
}
/*