anierin/msm-5.15
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: fix kernelci build-break for !CONFIG_ANDROID_VENDOR_OEM_DATA

Browse Source 
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: d2cb755a43 ("ANDROID: vendor hooks: Add hooks to support bootloader based hibernation")
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: I449e968f8d0926c8573150553eed0905faeac3f3
This commit is contained in:
Todd Kjos
2022-10-12 17:15:59 +00:00
parent 6232eecfa7
commit fae48a3639
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/hibernate.c
View File

@@ -127,8 +127,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())