Re: [PATCH v2] 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(a)cn.fujitsu.com&gt; --- kernel/audit.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) change from v1: convert "printk(KERN_INFO " to "pr_info(". thanks Richard for pointing out. diff --git a/kernel/audit.c b/kernel/audit.c index 8378c5e..7c7c028 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1038,17 +1038,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; } -- 1.8.3.1