aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
authorJames Morris <jmorris@namei.org>2009-06-10 21:03:14 -0400
committerJames Morris <jmorris@namei.org>2009-06-10 21:03:14 -0400
commit73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch)
tree7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /Documentation/kernel-parameters.txt
parent769f3e8c384795cc350e2aae27de2a12374d19d4 (diff)
parent35f2c2f6f6ae13ef23c4f68e6d3073753077ca43 (diff)
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index af43f45e8358..a5253f6d01af 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -916,6 +916,12 @@ and is between 256 and 4096 characters. It is defined in the file
916 Formt: { "sha1" | "md5" } 916 Formt: { "sha1" | "md5" }
917 default: "sha1" 917 default: "sha1"
918 918
919 ima_tcb [IMA]
920 Load a policy which meets the needs of the Trusted
921 Computing Base. This means IMA will measure all
922 programs exec'd, files mmap'd for exec, and all files
923 opened for read by uid=0.
924
919 in2000= [HW,SCSI] 925 in2000= [HW,SCSI]
920 See header of drivers/scsi/in2000.c. 926 See header of drivers/scsi/in2000.c.
921 927