Given that CPACR_EL1 is aliased to CPTR_EL2 when running at EL2 with VHE enabled, we can just fall back to SetupExceptionLevel1() instead of fiddling with the init values for CPTR_EL2. While at it, use the existing define to refer to the E2H bit in HCR_EL2. Signed-off-by: Ard Biesheuvel <ardb@kernel.org>