From 47af2fba7c037c079a7dca2cf300206ce2f6189c Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Wed, 12 Oct 2022 17:15:59 +0000 Subject: [PATCH] ANDROID: fix kernelci build-break for !CONFIG_ANDROID_VENDOR_OEM_DATA A recent change to add hooks for firmware-based hibernation added a reference to android_vendor_data1 which breaks builds that don't enable vendor data. Fixes: d2cb755a4398 ("ANDROID: vendor hooks: Add hooks to support bootloader based hibernation") Signed-off-by: Todd Kjos Change-Id: I449e968f8d0926c8573150553eed0905faeac3f3 --- 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 2ea6bc542101..f7e7ddc0b038 100644 --- a/arch/arm64/kernel/hibernate.c +++ b/arch/arm64/kernel/hibernate.c @@ -120,8 +120,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())