diff options
author | Nick Bray <ncbray@google.com> | 2017-11-30 15:49:54 -0800 |
---|---|---|
committer | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 13:15:43 +0530 |
commit | e5443d3699aecb5f7a2f349114a24424bd0f5643 (patch) | |
tree | 8ea92313ae27530927c9a631d1f29ab3df561fab /init | |
parent | bc6374f682c775dadafa985095543e0c8a9b2be2 (diff) |
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>
Diffstat (limited to 'init')
-rw-r--r-- | init/initramfs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index f8ce812ba43e..52059169f64d 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -621,8 +621,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(); + } err = unpack_to_rootfs(__initramfs_start, __initramfs_size); if (err) |