diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2018-04-10 12:36:45 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-04-11 19:49:30 +0200 |
| commit | e8b22d0f4500c7bb6aab879d4e32b2a00c89d5f8 (patch) | |
| tree | 1aef9db8bb544eb9cb546201a555d60d9127d975 /arch/arm64/kernel/cpu_errata.c | |
| parent | arm64: Get rid of __smccc_workaround_1_hvc_* (diff) | |
| download | linux-e8b22d0f4500c7bb6aab879d4e32b2a00c89d5f8.tar.xz linux-e8b22d0f4500c7bb6aab879d4e32b2a00c89d5f8.zip | |
arm64: Move the content of bpi.S to hyp-entry.S
bpi.S was introduced as we were starting to build the Spectre v2
mitigation framework, and it was rather unclear that it would
become strictly KVM specific.
Now that the picture is a lot clearer, let's move the content
of that file to hyp-entry.S, where it actually belong.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/cpu_errata.c')
| -rw-r--r-- | arch/arm64/kernel/cpu_errata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index fc9d017f2d33..a900befadfe8 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -86,7 +86,7 @@ atomic_t arm64_el2_vector_last_slot = ATOMIC_INIT(-1); DEFINE_PER_CPU_READ_MOSTLY(struct bp_hardening_data, bp_hardening_data); -#ifdef CONFIG_KVM +#ifdef CONFIG_KVM_INDIRECT_VECTORS extern char __smccc_workaround_1_smc_start[]; extern char __smccc_workaround_1_smc_end[]; @@ -137,7 +137,7 @@ static void __install_bp_hardening_cb(bp_hardening_cb_t fn, { __this_cpu_write(bp_hardening_data.fn, fn); } -#endif /* CONFIG_KVM */ +#endif /* CONFIG_KVM_INDIRECT_VECTORS */ static void install_bp_hardening_cb(const struct arm64_cpu_capabilities *entry, bp_hardening_cb_t fn, |