Merge 56cf5326 ("arm64: entry: Add macro for reading symbol addresses from...

Merge 56cf5326 ("arm64: entry: Add macro for reading symbol addresses from the trampoline") into android12-5.10-lts

Steps on the way to 5.10.105

Fixes up merge issues with:
	arch/arm64/include/asm/cpu.h
	arch/arm64/kernel/cpufeature.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4285e73db81b6760e046747779f6aa0b022f7cc8