integrity: move integrity_audit_msg()

This patch moves the integrity_audit_msg() function and defintion to
security/integrity/, the parent directory, renames the 'ima_audit'
boot command line option to 'integrity_audit', and fixes the Kconfig
help text to reflect the actual code.

Changelog:
- Fixed ifdef inclusion of integrity_audit_msg() (Fengguang Wu)

Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c3bfacb92910..cb5daa1cd605 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1129,11 +1129,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                         The builtin appraise policy appraises all files
                         owned by uid=0.
 
-        ima_audit=      [IMA]
-                        Format: { "0" | "1" }
-                        0 -- integrity auditing messages. (Default)
-                        1 -- enable informational integrity auditing messages.
-
         ima_hash=       [IMA]
                         Format: { "sha1" | "md5" }
                         default: "sha1"
@@ -1158,6 +1153,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
         inport.irq=     [HW] Inport (ATI XL and Microsoft) busmouse driver
                         Format: <irq>
 
+        integrity_audit=[IMA]
+                        Format: { "0" | "1" }
+                        0 -- basic integrity auditing messages. (Default)
+                        1 -- additional integrity auditing messages.
+
         intel_iommu=    [DMAR] Intel IOMMU driver (DMAR) option
                 on
                         Enable intel iommu driver.