diff options
| author | Will Deacon <will@kernel.org> | 2022-12-06 11:44:07 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-12-06 11:44:07 +0100 |
| commit | 9f930478c648d25e3a4c3db3d69a65cf05ff939a (patch) | |
| tree | 8ab71a9c8c3522c7f1727b374e6aeb7b60120dea /arch/arm64/kernel/entry.S | |
| parent | Merge branch 'for-next/asm-const' into for-next/core (diff) | |
| parent | kselftest/arm64: Add SVE 2.1 to hwcap test (diff) | |
| download | linux-9f930478c648d25e3a4c3db3d69a65cf05ff939a.tar.xz linux-9f930478c648d25e3a4c3db3d69a65cf05ff939a.zip | |
Merge branch 'for-next/cpufeature' into for-next/core
* for-next/cpufeature:
kselftest/arm64: Add SVE 2.1 to hwcap test
arm64/hwcap: Add support for SVE 2.1
kselftest/arm64: Add FEAT_RPRFM to the hwcap test
arm64/hwcap: Add support for FEAT_RPRFM
kselftest/arm64: Add FEAT_CSSC to the hwcap selftest
arm64/hwcap: Add support for FEAT_CSSC
arm64: Enable data independent timing (DIT) in the kernel
Diffstat (limited to 'arch/arm64/kernel/entry.S')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index e28137d64b76..11cb99c4d298 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -197,6 +197,9 @@ alternative_cb_end .endm .macro kernel_entry, el, regsize = 64 + .if \el == 0 + alternative_insn nop, SET_PSTATE_DIT(1), ARM64_HAS_DIT + .endif .if \regsize == 32 mov w0, w0 // zero upper 32 bits of x0 .endif |