Commit ee195452 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Petr Mladek
Browse files

Fix up for "printk: Drop pr_warning definition" 

Link: http://lkml.kernel.org/r/20191206092503.303d6a57@canb.auug.org.au


Cc: Linux Next Mailing List <linux-next@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent 1d9a6159

kernel/trace/ring_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -5070,7 +5070,7 @@ static __init int test_ringbuffer(void) 
	int ret = 0;



	if (security_locked_down(LOCKDOWN_TRACEFS)) {

		pr_warning("Lockdown is enabled, skipping ring buffer tests\n");

		pr_warn("Lockdown is enabled, skipping ring buffer tests\n");

		return 0;

	}

kernel/trace/trace.c

+3 −3
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ int __init register_tracer(struct tracer *type) 
	}



	if (security_locked_down(LOCKDOWN_TRACEFS)) {

		pr_warning("Can not register tracer %s due to lockdown\n",

		pr_warn("Can not register tracer %s due to lockdown\n",

			   type->name);

		return -EPERM;

	}
@@ -8796,7 +8796,7 @@ struct dentry *tracing_init_dentry(void) 
	struct trace_array *tr = &global_trace;



	if (security_locked_down(LOCKDOWN_TRACEFS)) {

		pr_warning("Tracing disabled due to lockdown\n");

		pr_warn("Tracing disabled due to lockdown\n");

		return ERR_PTR(-EPERM);

	}
@@ -9244,7 +9244,7 @@ __init static int tracer_alloc_buffers(void) 




	if (security_locked_down(LOCKDOWN_TRACEFS)) {

		pr_warning("Tracing disabled due to lockdown\n");

		pr_warn("Tracing disabled due to lockdown\n");

		return -EPERM;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE