diff options
| author | Catalin Marinas <catalin.marinas@arm.com> | 2022-09-30 09:18:22 +0100 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2022-09-30 09:18:22 +0100 |
| commit | c704cf27a1adc5fa40fb8e40b5617bdca889a419 (patch) | |
| tree | 47d4dc5c6a938ca90e370dc45767ce3971d49616 /arch/arm64/tools/cpucaps | |
| parent | c397623262fada5df2f92a861000957c36f330c1 (diff) | |
| parent | ba00c2a04fa5431d204a4183062b30372c062aa7 (diff) | |
Merge branch 'for-next/alternatives' into for-next/core
* for-next/alternatives:
: Alternatives (code patching) improvements
arm64: fix the build with binutils 2.27
arm64: avoid BUILD_BUG_ON() in alternative-macros
arm64: alternatives: add shared NOP callback
arm64: alternatives: add alternative_has_feature_*()
arm64: alternatives: have callbacks take a cap
arm64: alternatives: make alt_region const
arm64: alternatives: hoist print out of __apply_alternatives()
arm64: alternatives: proton-pack: prepare for cap changes
arm64: alternatives: kvm: prepare for cap changes
arm64: cpufeature: make cpus_have_cap() noinstr-safe
Diffstat (limited to 'arch/arm64/tools/cpucaps')
| -rw-r--r-- | arch/arm64/tools/cpucaps | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/tools/cpucaps b/arch/arm64/tools/cpucaps index f553a7cb1b07..f1c0347ec31a 100644 --- a/arch/arm64/tools/cpucaps +++ b/arch/arm64/tools/cpucaps @@ -2,6 +2,8 @@ # # Internal CPU capabilities constants, keep this list sorted +ALWAYS_BOOT +ALWAYS_SYSTEM BTI # Unreliable: use system_supports_32bit_el0() instead. HAS_32BIT_EL0_DO_NOT_USE |