From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Thu, 31 Oct 2013 06:31:01 +0000 (+0800)
Subject: audit: remove useless code in audit_enable
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d3ca0344b21f04786219bf0f49647f24e4e17323;p=linux-beck.git

audit: remove useless code in audit_enable

Since kernel parameter is operated before
initcall, so the audit_initialized must be
AUDIT_UNINITIALIZED or DISABLED in audit_enable.

Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Eric Paris <eparis@redhat.com>
---

diff --git a/kernel/audit.c b/kernel/audit.c
index 37ba59936dc5..14324dd186dc 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1116,17 +1116,8 @@ static int __init audit_enable(char *str)
 	if (!audit_default)
 		audit_initialized = AUDIT_DISABLED;
 
-	printk(KERN_INFO "audit: %s", audit_default ? "enabled" : "disabled");
-
-	if (audit_initialized == AUDIT_INITIALIZED) {
-		audit_enabled = audit_default;
-		audit_ever_enabled |= !!audit_default;
-	} else if (audit_initialized == AUDIT_UNINITIALIZED) {
-		printk(" (after initialization)");
-	} else {
-		printk(" (until reboot)");
-	}
-	printk("\n");
+	pr_info("audit: %s\n", audit_default ?
+		"enabled (after initialization)" : "disabled (until reboot)");
 
 	return 1;
 }