github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: initramfs: call free_initrd() when skipping init

Browse Source 
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>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
This commit is contained in:
Nick Bray 2017-11-30 15:49:54 -08:00 committed by Tao Huang
parent 79f3326944
commit 008704c50f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
init/initramfs.c
View File

@ -631,8 +631,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);