summaryrefslogtreecommitdiff
path: root/Documentation/admin-guide
diff options
context:
space:
mode:
authorWill Deacon <will@kernel.org>2024-05-09 17:55:47 +0300
committerWill Deacon <will@kernel.org>2024-05-09 17:55:47 +0300
commit7a7f6045ca00588e6d53f2975a16058d901a1855 (patch)
tree2e303f20d08e2bc220a59f0b2e6461b52c4c59db /Documentation/admin-guide
parentd4ea881fe6210230083d213d9373e8d0016d8523 (diff)
parent588de8c6d3621a4d712ccf834c205a74a84180a8 (diff)
downloadlinux-7a7f6045ca00588e6d53f2975a16058d901a1855.tar.xz
Merge branch 'for-next/misc' into for-next/core
* for-next/misc: arm64: simplify arch_static_branch/_jump function arm64: Add the arm64.no32bit_el0 command line option arm64: defer clearing DAIF.D arm64: assembler: update stale comment for disable_step_tsk arm64/sysreg: Update PIE permission encodings arm64: Add Neoverse-V2 part arm64: Remove unnecessary irqflags alternative.h include
Diffstat (limited to 'Documentation/admin-guide')
-rw-r--r--Documentation/admin-guide/kernel-parameters.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 623fce7d5fcd..afd6fcc1e8b9 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -431,6 +431,9 @@
arcrimi= [HW,NET] ARCnet - "RIM I" (entirely mem-mapped) cards
Format: <io>,<irq>,<nodeID>
+ arm64.no32bit_el0 [ARM64] Unconditionally disable the execution of
+ 32 bit applications.
+
arm64.nobti [ARM64] Unconditionally disable Branch Target
Identification support