diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2009-02-04 09:06:57 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-02-05 17:05:30 -0500 |
| commit | 6146f0d5e47ca4047ffded0fb79b6c25359b386c (patch) | |
| tree | edd792e52ad56d4a5d3ac6caa8437d3283fc157e /Documentation/kernel-parameters.txt | |
| parent | 659aaf2bb5496a425ba14036b5b5900f593e4484 (diff) | |
integrity: IMA hooks
This patch replaces the generic integrity hooks, for which IMA registered
itself, with IMA integrity hooks in the appropriate places directly
in the fs directory.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a2d8805c03d5..7c67b94d1823 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -44,6 +44,7 @@ parameter is applicable: | |||
| 44 | FB The frame buffer device is enabled. | 44 | FB The frame buffer device is enabled. |
| 45 | HW Appropriate hardware is enabled. | 45 | HW Appropriate hardware is enabled. |
| 46 | IA-64 IA-64 architecture is enabled. | 46 | IA-64 IA-64 architecture is enabled. |
| 47 | IMA Integrity measurement architecture is enabled. | ||
| 47 | IOSCHED More than one I/O scheduler is enabled. | 48 | IOSCHED More than one I/O scheduler is enabled. |
| 48 | IP_PNP IP DHCP, BOOTP, or RARP is enabled. | 49 | IP_PNP IP DHCP, BOOTP, or RARP is enabled. |
| 49 | ISAPNP ISA PnP code is enabled. | 50 | ISAPNP ISA PnP code is enabled. |