Merge branch 'akpm' (patches from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 "Quite a lot of other stuff is banked up awaiting further
  next->mainline merging, but this batch contains:

   - Lots of random misc patches
   - OCFS2
   - Most of MM
   - backlight updates
   - lib/ updates
   - printk updates
   - checkpatch updates
   - epoll tweaking
   - rtc updates
   - hfs
   - hfsplus
   - documentation
   - procfs
   - update gcov to gcc-4.7 format
   - IPC"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (269 commits)
  ipc, msg: fix message length check for negative values
  ipc/util.c: remove unnecessary work pending test
  devpts: plug the memory leak in kill_sb
  ./Makefile: export initial ramdisk compression config option
  init/Kconfig: add option to disable kernel compression
  drivers: w1: make w1_slave::flags long to avoid memory corruption
  drivers/w1/masters/ds1wm.cuse dev_get_platdata()
  drivers/memstick/core/ms_block.c: fix unreachable state in h_msb_read_page()
  drivers/memstick/core/mspro_block.c: fix attributes array allocation
  drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
  kernel/panic.c: reduce 1 byte usage for print tainted buffer
  gcov: reuse kbasename helper
  kernel/gcov/fs.c: use pr_warn()
  kernel/module.c: use pr_foo()
  gcov: compile specific gcov implementation based on gcc version
  gcov: add support for gcc 4.7 gcov format
  gcov: move gcov structs definitions to a gcc version specific file
  kernel/taskstats.c: return -ENOMEM when alloc memory fails in add_del_listener()
  kernel/taskstats.c: add nla_nest_cancel() for failure processing between nla_nest_start() and nla_nest_end()
  kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
  ...

4 files changed, 50 insertions, 12 deletions

diff --git a/init/Kconfig b/init/Kconfig
index bc8911fab28e..5496f307988e 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -118,7 +118,6 @@ config HAVE_KERNEL_LZ4
 choice
         prompt "Kernel compression mode"
         default KERNEL_GZIP
-        depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA || HAVE_KERNEL_XZ || HAVE_KERNEL_LZO || HAVE_KERNEL_LZ4
         help
           The linux kernel is a kind of self-extracting executable.
           Several compression algorithms are available, which differ
@@ -137,6 +136,13 @@ choice
 
           If in doubt, select 'gzip'
 
+config KERNEL_UNCOMPRESSED
+        bool "No compression"
+        help
+          No compression at all. The kernel is huge but the compression and
+          decompression times are zero.
+          This is usually not what you want.
+
 config KERNEL_GZIP
         bool "Gzip"
         depends on HAVE_KERNEL_GZIP
diff --git a/init/do_mounts.c b/init/do_mounts.c
index a51cddc2ff8c..8e5addc45874 100644
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -197,6 +197,8 @@ done:
  *         is a zero-filled hex representation of the 1-based partition number.
  *      7) PARTUUID=<UUID>/PARTNROFF=<int> to select a partition in relation to
  *         a partition with a known unique id.
+ *      8) <major>:<minor> major and minor number of the device separated by
+ *         a colon.
  *
  *      If name doesn't have fall into the categories above, we return (0,0).
  *      block_class is used to check if something is a disk name. If the disk
diff --git a/init/do_mounts_rd.c b/init/do_mounts_rd.c
index 6be2879cca66..7c098ac9068a 100644
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -57,6 +57,11 @@ static int __init crd_load(int in_fd, int out_fd, decompress_fn deco);
  *      cramfs
  *      squashfs
  *      gzip
+ *      bzip2
+ *      lzma
+ *      xz
+ *      lzo
+ *      lz4
  */
 static int __init
 identify_ramdisk_image(int fd, int start_block, decompress_fn *decompressor)
@@ -342,6 +347,13 @@ static int __init crd_load(int in_fd, int out_fd, decompress_fn deco)
         int result;
         crd_infd = in_fd;
         crd_outfd = out_fd;
+
+        if (!deco) {
+                pr_emerg("Invalid ramdisk decompression routine.  "
+                         "Select appropriate config option.\n");
+                panic("Could not decompress initial ramdisk image.");
+        }
+
         result = deco(NULL, 0, compr_fill, compr_flush, NULL, NULL, error);
         if (decompress_error)
                 result = 1;
diff --git a/init/main.c b/init/main.c
index 379090fadac9..67ee8ef0a669 100644
--- a/init/main.c
+++ b/init/main.c
@@ -124,7 +124,6 @@ EXPORT_SYMBOL(system_state);
 extern void time_init(void);
 /* Default late time init is NULL. archs can override this later. */
 void (*__initdata late_time_init)(void);
-extern void softirq_init(void);
 
 /* Untouched command line saved by arch-specific code. */
 char __initdata boot_command_line[COMMAND_LINE_SIZE];
@@ -811,10 +810,26 @@ static int run_init_process(const char *init_filename)
                 (const char __user *const __user *)envp_init);
 }
 
+static int try_to_run_init_process(const char *init_filename)
+{
+        int ret;
+
+        ret = run_init_process(init_filename);
+
+        if (ret && ret != -ENOENT) {
+                pr_err("Starting init: %s exists but couldn't execute it (error %d)\n",
+                       init_filename, ret);
+        }
+
+        return ret;
+}
+
 static noinline void __init kernel_init_freeable(void);
 
 static int __ref kernel_init(void *unused)
 {
+        int ret;
+
         kernel_init_freeable();
         /* need to finish all async __init code before freeing the memory */
         async_synchronize_full();
@@ -826,9 +841,11 @@ static int __ref kernel_init(void *unused)
         flush_delayed_fput();
 
         if (ramdisk_execute_command) {
-                if (!run_init_process(ramdisk_execute_command))
+                ret = run_init_process(ramdisk_execute_command);
+                if (!ret)
                         return 0;
-                pr_err("Failed to execute %s\n", ramdisk_execute_command);
+                pr_err("Failed to execute %s (error %d)\n",
+                       ramdisk_execute_command, ret);
         }
 
         /*
@@ -838,18 +855,19 @@ static int __ref kernel_init(void *unused)
          * trying to recover a really broken machine.
          */
         if (execute_command) {
-                if (!run_init_process(execute_command))
+                ret = run_init_process(execute_command);
+                if (!ret)
                         return 0;
-                pr_err("Failed to execute %s.  Attempting defaults...\n",
-                        execute_command);
+                pr_err("Failed to execute %s (error %d).  Attempting defaults...\n",
+                        execute_command, ret);
         }
-        if (!run_init_process("/sbin/init") ||
-            !run_init_process("/etc/init") ||
-            !run_init_process("/bin/init") ||
-            !run_init_process("/bin/sh"))
+        if (!try_to_run_init_process("/sbin/init") ||
+            !try_to_run_init_process("/etc/init") ||
+            !try_to_run_init_process("/bin/init") ||
+            !try_to_run_init_process("/bin/sh"))
                 return 0;
 
-        panic("No init found.  Try passing init= option to kernel. "
+        panic("No working init found.  Try passing init= option to kernel. "
               "See Linux Documentation/init.txt for guidance.");
 }