Commit cc43e740 authored Nov 30, 2017 by Nick Bray Committed by Dmitry Shmidt Dec 18, 2017

ANDROID: initramfs: call free_initrd() when skipping init



Memory allocated for initrd would not be reclaimed if initializing ramfs
was skipped.

Bug: 69901741
Test: "grep MemTotal /proc/meminfo" increases by a few MB on an Android
device with a/b boot.

Change-Id: Ifbe094d303ed12cfd6de6aa004a8a19137a2f58a
Signed-off-by: Nick Bray <ncbray@google.com>

parent 9e759250

init/initramfs.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -623,8 +623,11 @@ static int __init populate_rootfs(void)
		{
		char *err;

		if (do_skip_initramfs)
		if (do_skip_initramfs) {
		if (initrd_start)
		free_initrd();
		return default_rootfs();
		}

		/* Load the built in initramfs */
		err = unpack_to_rootfs(__initramfs_start, __initramfs_size);