2 files changed, 64 insertions, 7 deletions

diff --git a/init/Kconfig b/init/Kconfig
index e84c6423a2e5..e25a82a291a6 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -811,6 +811,7 @@ config LOG_BUF_SHIFT
         int "Kernel log buffer size (16 => 64KB, 17 => 128KB)"
         range 12 21
         default 17
+        depends on PRINTK
         help
           Select the minimal kernel log buffer size as a power of 2.
           The final size is affected by LOG_CPU_MAX_BUF_SHIFT config
@@ -830,6 +831,7 @@ config LOG_CPU_MAX_BUF_SHIFT
         range 0 21
         default 12 if !BASE_SMALL
         default 0 if BASE_SMALL
+        depends on PRINTK
         help
           This option allows to increase the default ring buffer size
           according to the number of CPUs. The value defines the contribution
@@ -1475,6 +1477,7 @@ config FUTEX
 
 config HAVE_FUTEX_CMPXCHG
         bool
+        depends on FUTEX
         help
           Architectures should select this if futex_atomic_cmpxchg_inatomic()
           is implemented and always working. This removes a couple of runtime
@@ -1537,6 +1540,16 @@ config AIO
           by some high performance threaded applications. Disabling
           this option saves about 7k.
 
+config ADVISE_SYSCALLS
+        bool "Enable madvise/fadvise syscalls" if EXPERT
+        default y
+        help
+          This option enables the madvise and fadvise syscalls, used by
+          applications to advise the kernel about their future memory or file
+          usage, improving performance. If building an embedded system where no
+          applications use these syscalls, you can disable this option to save
+          space.
+
 config PCI_QUIRKS
         default y
         bool "Enable PCI quirk workarounds" if EXPERT
@@ -1906,6 +1919,49 @@ config MODULE_SIG_HASH
         default "sha384" if MODULE_SIG_SHA384
         default "sha512" if MODULE_SIG_SHA512
 
+config MODULE_COMPRESS
+        bool "Compress modules on installation"
+        depends on MODULES
+        help
+          This option compresses the kernel modules when 'make
+          modules_install' is run.
+
+          The modules will be compressed either using gzip or xz depend on the
+          choice made in "Compression algorithm".
+
+          module-init-tools has support for gzip format while kmod handle gzip
+          and xz compressed modules.
+
+          When a kernel module is installed from outside of the main kernel
+          source and uses the Kbuild system for installing modules then that
+          kernel module will also be compressed when it is installed.
+
+          This option provides little benefit when the modules are to be used inside
+          an initrd or initramfs, it generally is more efficient to compress the whole
+          initrd or initramfs instead.
+
+          This is fully compatible with signed modules while the signed module is
+          compressed. module-init-tools or kmod handles decompression and provide to
+          other layer the uncompressed but signed payload.
+
+choice
+        prompt "Compression algorithm"
+        depends on MODULE_COMPRESS
+        default MODULE_COMPRESS_GZIP
+        help
+          This determines which sort of compression will be used during
+          'make modules_install'.
+
+          GZIP (default) and XZ are supported.
+
+config MODULE_COMPRESS_GZIP
+        bool "GZIP"
+
+config MODULE_COMPRESS_XZ
+        bool "XZ"
+
+endchoice
+
 endif # MODULES
 
 config INIT_ALL_POSSIBLE
diff --git a/init/do_mounts.c b/init/do_mounts.c
index b6237c31b0e2..9b3565c41502 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -182,7 +182,8 @@ done:
 /*
  *      Convert a name into device number.  We accept the following variants:
  *
- *      1) device number in hexadecimal represents itself
+ *      1) <hex_major><hex_minor> device number in hexadecimal represents itself
+ *         no leading 0x, for example b302.
  *      2) /dev/nfs represents Root_NFS (0xff)
  *      3) /dev/<disk_name> represents the device number of disk
  *      4) /dev/<disk_name><decimal> represents the device number
@@ -539,6 +540,12 @@ void __init prepare_namespace(void)
 {
         int is_floppy;
 
+        if (root_delay) {
+                printk(KERN_INFO "Waiting %d sec before mounting root device...\n",
+                       root_delay);
+                ssleep(root_delay);
+        }
+
         /*
          * wait for the known devices to complete their probing
          *
@@ -565,12 +572,6 @@ void __init prepare_namespace(void)
         if (initrd_load())
                 goto out;
 
-        if (root_delay) {
-                pr_info("Waiting %d sec before mounting root device...\n",
-                        root_delay);
-                ssleep(root_delay);
-        }
-
         /* wait for any asynchronous scanning to complete */
         if ((ROOT_DEV == 0) && root_wait) {
                 printk(KERN_INFO "Waiting for root device %s...\n",