aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 2b2407d9a6d0..b61f89fa01c1 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -93,6 +93,7 @@ parameter is applicable:
93 Documentation/scsi/. 93 Documentation/scsi/.
94 SECURITY Different security models are enabled. 94 SECURITY Different security models are enabled.
95 SELINUX SELinux support is enabled. 95 SELINUX SELinux support is enabled.
96 APPARMOR AppArmor support is enabled.
96 SERIAL Serial support is enabled. 97 SERIAL Serial support is enabled.
97 SH SuperH architecture is enabled. 98 SH SuperH architecture is enabled.
98 SMP The kernel is an SMP kernel. 99 SMP The kernel is an SMP kernel.
@@ -2312,6 +2313,13 @@ and is between 256 and 4096 characters. It is defined in the file
2312 If enabled at boot time, /selinux/disable can be used 2313 If enabled at boot time, /selinux/disable can be used
2313 later to disable prior to initial policy load. 2314 later to disable prior to initial policy load.
2314 2315
2316 apparmor= [APPARMOR] Disable or enable AppArmor at boot time
2317 Format: { "0" | "1" }
2318 See security/apparmor/Kconfig help text
2319 0 -- disable.
2320 1 -- enable.
2321 Default value is set via kernel config option.
2322
2315 serialnumber [BUGS=X86-32] 2323 serialnumber [BUGS=X86-32]
2316 2324
2317 shapers= [NET] 2325 shapers= [NET]