2 files changed, 20 insertions, 20 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 8dfd094e6875..4e337906016e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -130,13 +130,16 @@ config HAVE_KERNEL_BZIP2
 config HAVE_KERNEL_LZMA
         bool
 
+config HAVE_KERNEL_XZ
+        bool
+
 config HAVE_KERNEL_LZO
         bool
 
 choice
         prompt "Kernel compression mode"
         default KERNEL_GZIP
-        depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_LZO
+        depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO
         help
           The linux kernel is a kind of self-extracting executable.
           Several compression algorithms are available, which differ
@@ -181,6 +184,21 @@ config KERNEL_LZMA
           two. Compression is slowest.  The kernel size is about 33%
           smaller with LZMA in comparison to gzip.
 
+config KERNEL_XZ
+        bool "XZ"
+        depends on HAVE_KERNEL_XZ
+        help
+          XZ uses the LZMA2 algorithm and instruction set specific
+          BCJ filters which can improve compression ratio of executable
+          code. The size of the kernel is about 30% smaller with XZ in
+          comparison to gzip. On architectures for which there is a BCJ
+          filter (i386, x86_64, ARM, IA-64, PowerPC, and SPARC), XZ
+          will create a few percent smaller kernel than plain LZMA.
+
+          The speed is about the same as with LZMA: The decompression
+          speed of XZ is better than that of bzip2 but worse than gzip
+          and LZO. Compression is slow.
+
 config KERNEL_LZO
         bool "LZO"
         depends on HAVE_KERNEL_LZO
@@ -497,21 +515,6 @@ config RCU_BOOST_DELAY
 
           Accept the default if unsure.
 
-config SRCU_SYNCHRONIZE_DELAY
-        int "Microseconds to delay before waiting for readers"
-        range 0 20
-        default 10
-        help
-          This option controls how long SRCU delays before entering its
-          loop waiting on SRCU readers.  The purpose of this loop is
-          to avoid the unconditional context-switch penalty that would
-          otherwise be incurred if there was an active SRCU reader,
-          in a manner similar to adaptive locking schemes.  This should
-          be set to be a bit longer than the common-case SRCU read-side
-          critical-section overhead.
-
-          Accept the default if unsure.
-
 endmenu # "RCU Subsystem"
 
 config IKCONFIG
@@ -673,7 +676,7 @@ config CGROUP_MEM_RES_CTLR_SWAP_ENABLED
         help
           Memory Resource Controller Swap Extension comes with its price in
           a bigger memory consumption. General purpose distribution kernels
-          which want to enable the feautre but keep it disabled by default
+          which want to enable the feature but keep it disabled by default
           and let the user enable it by swapaccount boot command line
           parameter should have this option unselected.
           For those who want to have the feature enabled by default should
diff --git a/init/main.c b/init/main.c
index ea51770c0170..00799c1d4628 100644
--- a/init/main.c
+++ b/init/main.c
@@ -777,9 +777,6 @@ static void __init do_initcalls(void)
 
         for (fn = __early_initcall_end; fn < __initcall_end; fn++)
                 do_one_initcall(*fn);
-
-        /* Make sure there is no pending stuff from the initcall sequence */
-        flush_scheduled_work();
 }
 
 /*