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>

1 files changed, 4 insertions, 1 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)
 {