Merge branch 'linus' into tracing/core

Merge reason: tracing/core was on a .30-rc1 base and was missing out on
              on a handful of tracing fixes present in .30-rc5-almost.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 10 insertions, 2 deletions

diff --git a/init/initramfs.c b/init/initramfs.c
index 80cd713f6cc5..9ee7b7810417 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -310,7 +310,8 @@ static int __init do_name(void)
                         if (wfd >= 0) {
                                 sys_fchown(wfd, uid, gid);
                                 sys_fchmod(wfd, mode);
-                                sys_ftruncate(wfd, body_len);
+                                if (body_len)
+                                        sys_ftruncate(wfd, body_len);
                                 vcollected = kstrdup(collected, GFP_KERNEL);
                                 state = CopyFile;
                         }
@@ -515,6 +516,7 @@ skip:
         initrd_end = 0;
 }
 
+#ifdef CONFIG_BLK_DEV_RAM
 #define BUF_SIZE 1024
 static void __init clean_rootfs(void)
 {
@@ -561,6 +563,7 @@ static void __init clean_rootfs(void)
         sys_close(fd);
         kfree(buf);
 }
+#endif
 
 static int __init populate_rootfs(void)
 {
diff --git a/init/main.c b/init/main.c
index eece40cd8a64..7c6a652d3d78 100644
--- a/init/main.c
+++ b/init/main.c
@@ -492,6 +492,11 @@ static int __init do_early_param(char *param, char *val)
         return 0;
 }
 
+void __init parse_early_options(char *cmdline)
+{
+        parse_args("early options", cmdline, NULL, 0, do_early_param);
+}
+
 /* Arch code calls this early on, or if not, just before other parsing. */
 void __init parse_early_param(void)
 {
@@ -503,7 +508,7 @@ void __init parse_early_param(void)
 
         /* All fall through to do_early_param. */
         strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
-        parse_args("early options", tmp_cmdline, NULL, 0, do_early_param);
+        parse_early_options(tmp_cmdline);
         done = 1;
 }