diff options
| author | Nick Bray <ncbray@google.com> | 2017-11-30 15:49:54 -0800 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2017-12-05 17:51:14 +0100 |
| commit | cc09136076f0759a660dde7f04aa2e87a36ebbbb (patch) | |
| tree | 56c7d1b759a42b4486e75c1b6e42c6668041e210 | |
| parent | ac19aa617991eecc45db9734991af33315f0bf16 (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>
| -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 43ae0cc9d..eb2275e11 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -595,8 +595,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) |