diff options
| author | Will Deacon <will@kernel.org> | 2021-02-12 16:07:34 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2021-02-12 16:07:34 +0100 |
| commit | 1d32854ea76331d10d376ed3ac67831b94466ae9 (patch) | |
| tree | 042e0b579b4e9e98ba926b3c6e495596c30cb138 /arch/arm64/kernel/hyp-stub.S | |
| parent | Merge branch 'for-next/kexec' into for-next/core (diff) | |
| parent | arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+ (diff) | |
| download | linux-1d32854ea76331d10d376ed3ac67831b94466ae9.tar.xz linux-1d32854ea76331d10d376ed3ac67831b94466ae9.zip | |
Merge branch 'for-next/misc' into for-next/core
Miscellaneous arm64 changes for 5.12.
* for-next/misc:
arm64: Make CPU_BIG_ENDIAN depend on ld.bfd or ld.lld 13.0.0+
arm64: vmlinux.ld.S: add assertion for tramp_pg_dir offset
arm64: vmlinux.ld.S: add assertion for reserved_pg_dir offset
arm64/ptdump:display the Linear Mapping start marker
arm64: ptrace: Fix missing return in hw breakpoint code
KVM: arm64: Move __hyp_set_vectors out of .hyp.text
arm64: Include linux/io.h in mm/mmap.c
arm64: cacheflush: Remove stale comment
arm64: mm: Remove unused header file
arm64/sparsemem: reduce SECTION_SIZE_BITS
arm64/mm: Add warning for outside range requests in vmemmap_populate()
arm64: Drop workaround for broken 'S' constraint with GCC 4.9
Diffstat (limited to 'arch/arm64/kernel/hyp-stub.S')
| -rw-r--r-- | arch/arm64/kernel/hyp-stub.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S index 3e08dcc924b5..678cd2c618ee 100644 --- a/arch/arm64/kernel/hyp-stub.S +++ b/arch/arm64/kernel/hyp-stub.S @@ -170,6 +170,8 @@ SYM_CODE_END(\label) invalid_vector el1_fiq_invalid invalid_vector el1_error_invalid + .popsection + /* * __hyp_set_vectors: Call this after boot to set the initial hypervisor * vectors as part of hypervisor installation. On an SMP system, this should |