diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-02-08 12:57:17 +0300 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-09 16:47:11 +0300 |
| commit | e2df464173f0b585adb958a09536eae2cd1dbefd (patch) | |
| tree | 270c0e0c220d7eaa0a0f31a1092caa934e87affb /arch/arm64/kernel/head.S | |
| parent | 19e87e131915a2389a08874092a82fe5aa0f8952 (diff) | |
| download | linux-e2df464173f0b585adb958a09536eae2cd1dbefd.tar.xz | |
arm64: Simplify init_el2_state to be non-VHE only
As init_el2_state is now nVHE only, let's simplify it and drop
the VHE setup.
Signed-off-by: Marc Zyngier <maz@kernel.org>
Acked-by: David Brazdil <dbrazdil@google.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Link: https://lore.kernel.org/r/20210208095732.3267263-9-maz@kernel.org
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index ec66dc061b0c..0a46f722f051 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -501,7 +501,7 @@ SYM_INNER_LABEL(init_el2, SYM_L_LOCAL) msr hcr_el2, x0 isb - init_el2_state nvhe + init_el2_state /* Hypervisor stub */ adr_l x0, __hyp_stub_vectors |