Skip to content

Commit ee19545

Browse files
sfrothwellpmladek
authored andcommitted
Fix up for "printk: Drop pr_warning definition"
Link: http://lkml.kernel.org/r/[email protected] Cc: Linux Next Mailing List <[email protected]> Cc: Linux Kernel Mailing List <[email protected]> Cc: "Steven Rostedt (VMware)" <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Linus Torvalds <[email protected]> Signed-off-by: Stephen Rothwell <[email protected]> Signed-off-by: Petr Mladek <[email protected]>
1 parent 1d9a615 commit ee19545

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

kernel/trace/ring_buffer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5070,7 +5070,7 @@ static __init int test_ringbuffer(void)
50705070
int ret = 0;
50715071

50725072
if (security_locked_down(LOCKDOWN_TRACEFS)) {
5073-
pr_warning("Lockdown is enabled, skipping ring buffer tests\n");
5073+
pr_warn("Lockdown is enabled, skipping ring buffer tests\n");
50745074
return 0;
50755075
}
50765076

kernel/trace/trace.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,7 +1889,7 @@ int __init register_tracer(struct tracer *type)
18891889
}
18901890

18911891
if (security_locked_down(LOCKDOWN_TRACEFS)) {
1892-
pr_warning("Can not register tracer %s due to lockdown\n",
1892+
pr_warn("Can not register tracer %s due to lockdown\n",
18931893
type->name);
18941894
return -EPERM;
18951895
}
@@ -8796,7 +8796,7 @@ struct dentry *tracing_init_dentry(void)
87968796
struct trace_array *tr = &global_trace;
87978797

87988798
if (security_locked_down(LOCKDOWN_TRACEFS)) {
8799-
pr_warning("Tracing disabled due to lockdown\n");
8799+
pr_warn("Tracing disabled due to lockdown\n");
88008800
return ERR_PTR(-EPERM);
88018801
}
88028802

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

92459245

92469246
if (security_locked_down(LOCKDOWN_TRACEFS)) {
9247-
pr_warning("Tracing disabled due to lockdown\n");
9247+
pr_warn("Tracing disabled due to lockdown\n");
92489248
return -EPERM;
92499249
}
92509250

0 commit comments

Comments
 (0)