Merge "memshare: Skip collecting elf for failed hypervisor unmapping memory" (eb6f9f3e) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/soc/qcom/memshare/msm_memshare.c

+21 −18

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/err.h>
		@@ -260,11 +260,13 @@ static int mem_share_do_ramdump(void)
		dev_err(memsh_child->dev,
		"memshare: %s: failed to map the memory region to APPS\n",
		client_name);
		continue;
		} else {
		memblock[i].hyp_mapping = 0;
		}
		}

		if (!memblock[i].hyp_mapping) {
		ramdump_segments_tmp = kcalloc(1,
		sizeof(struct ramdump_segment),
		GFP_KERNEL);
		@@ -287,6 +289,7 @@ static int mem_share_do_ramdump(void)
		return ret;
		}
		}
		}
		return 0;
		}