2 files changed, 0 insertions, 26 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 5cff9a980c39..cb64c5889e02 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1143,30 +1143,6 @@ config TRACEPOINTS
 
 source "arch/Kconfig"
 
-config SLOW_WORK
-        default n
-        bool
-        help
-          The slow work thread pool provides a number of dynamically allocated
-          threads that can be used by the kernel to perform operations that
-          take a relatively long time.
-
-          An example of this would be CacheFiles doing a path lookup followed
-          by a series of mkdirs and a create call, all of which have to touch
-          disk.
-
-          See Documentation/slow-work.txt.
-
-config SLOW_WORK_DEBUG
-        bool "Slow work debugging through debugfs"
-        default n
-        depends on SLOW_WORK && DEBUG_FS
-        help
-          Display the contents of the slow work run queue through debugfs,
-          including items currently executing.
-
-          See Documentation/slow-work.txt.
-
 endmenu         # General setup
 
 config HAVE_GENERIC_DMA_COHERENT
diff --git a/init/main.c b/init/main.c
index b03a4c1f69fa..e97fadeec856 100644
--- a/init/main.c
+++ b/init/main.c
@@ -32,7 +32,6 @@
 #include <linux/start_kernel.h>
 #include <linux/security.h>
 #include <linux/smp.h>
-#include <linux/workqueue.h>
 #include <linux/profile.h>
 #include <linux/rcupdate.h>
 #include <linux/moduleparam.h>
@@ -789,7 +788,6 @@ static void __init do_initcalls(void)
  */
 static void __init do_basic_setup(void)
 {
-        init_workqueues();
         cpuset_init_smp();
         usermodehelper_init();
         init_tmpfs();