summaryrefslogtreecommitdiff
path: root/Documentation/arm64/booting.rst
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2022-12-06 11:33:29 +0000
committerWill Deacon <will@kernel.org>2022-12-06 11:33:29 +0000
commit9d84ad425dc7048196b817b7db4942e0c72d58a1 (patch)
treec6589a74624c367e663be6da12ca63c6f2dd4d53 /Documentation/arm64/booting.rst
parent70b1c62a677affbc0739b9c3dd3c26c0c89fd911 (diff)
parent67bc5b2d6d4802f46eceda246eb53a672b961831 (diff)
Merge branch 'for-next/trivial' into for-next/core
* for-next/trivial: arm64: alternatives: add __init/__initconst to some functions/variables arm64/asm: Remove unused assembler DAIF save/restore macros arm64/kpti: Move DAIF masking to C code Revert "arm64/mm: Drop redundant BUG_ON(!pgtable_alloc)" arm64/mm: Drop unused restore_ttbr1 arm64: alternatives: make apply_alternatives_vdso() static arm64/mm: Drop idmap_pg_end[] declaration arm64/mm: Drop redundant BUG_ON(!pgtable_alloc) arm64: make is_ttbrX_addr() noinstr-safe arm64/signal: Document our convention for choosing magic numbers arm64: atomics: lse: remove stale dependency on JUMP_LABEL arm64: paravirt: remove conduit check in has_pv_steal_clock arm64: entry: Fix typo arm64/booting: Add missing colon to FA64 entry arm64/mm: Drop ARM64_KERNEL_USES_PMD_MAPS arm64/asm: Remove unused enable_da macro
Diffstat (limited to 'Documentation/arm64/booting.rst')
-rw-r--r--Documentation/arm64/booting.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm64/booting.rst b/Documentation/arm64/booting.rst
index 5a764fabfea8..96fe10ec6c24 100644
--- a/Documentation/arm64/booting.rst
+++ b/Documentation/arm64/booting.rst
@@ -349,7 +349,7 @@ Before jumping into the kernel, the following conditions must be met:
- HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
- For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64)
+ For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64):
- If EL3 is present: