diff options
| author |   James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-11 11:03:14 +1000 |
| commit | 73fbad283cfbbcf02939bdbda31fc4a30e729cca (patch) | |
| tree | 7c89fe13e1b4a2c7f2d60f4ea6eaf69c14bccab7 /Documentation/kernel-parameters.txt | |
| parent | Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| parent | nommu: Provide mmap_min_addr definition. (diff) | |
| download | linux-dev-73fbad283cfbbcf02939bdbda31fc4a30e729cca.tar.xz linux-dev-73fbad283cfbbcf02939bdbda31fc4a30e729cca.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
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 Formt: { "sha1" | "md5" } default: "sha1" + ima_tcb [IMA] + Load a policy which meets the needs of the Trusted + Computing Base. This means IMA will measure all + programs exec'd, files mmap'd for exec, and all files + opened for read by uid=0. + in2000= [HW,SCSI] See header of drivers/scsi/in2000.c. |