+ initramfs-cleanup-populate_rootfs-fix.patch added to -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: initramfs: fix a compilation error
has been added to the -mm tree.  Its filename is
     initramfs-cleanup-populate_rootfs-fix.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/initramfs-cleanup-populate_rootfs-fix.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/initramfs-cleanup-populate_rootfs-fix.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Qian Cai <cai@xxxxxx>
Subject: initramfs: fix a compilation error

754006569c54 ("initramfs: cleanup populate_rootfs") introduced a
compilation error with CONFIG_BLK_DEV_RAM != y due to clean_rootfs() is
only declared with CONFIG_BLK_DEV_RAM=y.

init/initramfs.c: In function 'populate_rootfs':
init/initramfs.c:659:3: error: implicit declaration of function
'clean_rootfs'; did you mean 'clean_path'?
[-Werror=implicit-function-declaration]
   clean_rootfs();
   ^~~~~~~~~~~~
   clean_path

Link: http://lkml.kernel.org/r/20190328014806.36375-1-cai@xxxxxx
Signed-off-by: Qian Cai <cai@xxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 init/initramfs.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- a/init/initramfs.c~initramfs-cleanup-populate_rootfs-fix
+++ a/init/initramfs.c
@@ -595,7 +595,11 @@ static void __init clean_rootfs(void)
 	ksys_close(fd);
 	kfree(buf);
 }
-#endif
+#else
+static inline void clean_rootfs(void)
+{
+}
+#endif /* CONFIG_BLK_DEV_RAM */
 
 #ifdef CONFIG_BLK_DEV_RAM
 static void populate_initrd_image(char *err)
_

Patches currently in -mm which might be from cai@xxxxxx are

kasan-fix-variable-tag-set-but-not-used-warning.patch
mm-debug-add-a-cast-to-u64-for-atomic64_read.patch
mm-hotplug-fix-offline-undo_isolate_page_range.patch
mm-hotplug-fix-offline-undo_isolate_page_range-v4.patch
mm-hotplug-fix-notification-in-offline-error-path.patch
mm-fix-a-wrong-flag-in-set_migratetype_isolate.patch
mm-compaction-abort-search-if-isolation-fails-v2.patch
mm-compaction-fix-an-undefined-behaviour.patch
initramfs-cleanup-populate_rootfs-fix.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux