From f5cc702b4faeb9aa768acae0ad1107a7e5a49620 Mon Sep 17 00:00:00 2001 From: "joe.liu" Date: Tue, 15 Apr 2025 17:55:55 +0800 Subject: [PATCH] ANDROID: arm64: hibernate: Fix compile error while disabling CONFIG_ANDROID_VENDOR_OEM_DATA Bug: 410768225 Fixes: 4f8ffa0f0555 ("ANDROID: vendor hooks: Add hooks to support bootloader based hibernation") Change-Id: I613ca9c7938b2a6c31ca36f3fa8a5c2befbe4e70 Signed-off-by: joe.liu --- arch/arm64/kernel/hibernate.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c index 6e53ecfdfa12..7e7fd28464b6 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -119,8 +119,10 @@ int arch_hibernation_header_save(void *addr, unsigned int max_size) hdr->ttbr1_el1 = __pa_symbol(swapper_pg_dir); hdr->reenter_kernel = _cpu_resume; +#ifdef CONFIG_ANDROID_VENDOR_OEM_DATA trace_android_vh_save_cpu_resume(&hdr->android_vendor_data1, __pa(cpu_resume)); +#endif /* We can't use __hyp_get_vectors() because kvm may still be loaded */ if (el2_reset_needed())