From 72d8c8b9cbcf938b04265d56bb5c767485ca7ec4 Mon Sep 17 00:00:00 2001 From: xizx Date: Tue, 28 Jul 2020 11:08:27 +0800 Subject: [PATCH] tzlog_dump: workaround msm_dump_data_register undefine issue in GKI 5.4 workaround the compile error during GKI kernel 5.4: ERROR: "msm_dump_data_register" [../../motorola/kernel/modules/drivers/tzlog_dump/tzlog_dump.ko] undefined! Change-Id: I86d0ee261f5bbfe064165df7614ecf408Montana8697 Reviewed-on: https://gerrit.mot.com/1707351 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Guobin Zhang Submit-Approved: Jira Key --- drivers/tzlog_dump/tzlog_dump.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/tzlog_dump/tzlog_dump.c b/drivers/tzlog_dump/tzlog_dump.c index 89cc9590923e..e49920eccead 100644 --- a/drivers/tzlog_dump/tzlog_dump.c +++ b/drivers/tzlog_dump/tzlog_dump.c @@ -227,7 +227,14 @@ static void tzlog_dump_table_register(struct device *dev, tz_dump_data->len = pdata->mem_size; dump_entry.id = MSM_DUMP_DATA_TZ_LOG; dump_entry.addr = virt_to_phys(tz_dump_data); +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) err = msm_dump_data_register(MSM_DUMP_TABLE_APPS, &dump_entry); +#else + //walkaround the compile error in GKI +#ifdef CONFIG_QGKI + err = msm_dump_data_register(MSM_DUMP_TABLE_APPS, &dump_entry); +#endif +#endif if (err) { dev_err(dev, "Registering dump data failed.\n"); kfree(tz_dump_data);