From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Petr Mladek <pmladek@suse•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Steven Rostedt (VMware)" <rostedt@goodmis•org>,
Kefeng Wang <wangkefeng.wang@huawei•com>,
Linus Torvalds <torvalds@linux-foundation•org>
Subject: linux-next: build failure after merge of the printk tree
Date: Fri, 6 Dec 2019 09:25:03 +1100 [thread overview]
Message-ID: <20191206092503.303d6a57@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2558 bytes --]
Hi all,
After merging the printk tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
kernel/trace/trace.c: In function 'register_tracer':
kernel/trace/trace.c:1892:3: error: implicit declaration of function 'pr_warning'; did you mean 'pr_warn'? [-Werror=implicit-function-declaration]
1892 | pr_warning("Can not register tracer %s due to lockdown\n",
| ^~~~~~~~~~
| pr_warn
Caused by commit
55130ba7f010 ("printk: Drop pr_warning definition")
interacting with commit
a356646a5685 ("tracing: Do not create directories if lockdown is in affect")
from Linus' tree.
I have applied the following merge fix patch for today:
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Fri, 6 Dec 2019 09:21:57 +1100
Subject: [PATCH] fix up for "printk: Drop pr_warning definition"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
kernel/trace/ring_buffer.c | 2 +-
kernel/trace/trace.c | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index 4bf050fcfe3b..3f655371eaf6 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -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;
}
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 23459d53d576..6c75410f9698 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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;
}
--
2.24.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-12-05 22:25 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-05 22:25 Stephen Rothwell [this message]
2019-12-06 10:03 ` linux-next: build failure after merge of the printk tree Petr Mladek
-- strict thread matches above, loose matches on Subject: below --
2023-01-15 23:23 Stephen Rothwell
2023-01-16 15:54 ` Petr Mladek
2022-11-21 0:00 Stephen Rothwell
2022-11-21 13:42 ` Petr Mladek
2021-07-20 7:43 Stephen Rothwell
2021-07-20 8:17 ` Naresh Kamboju
2021-07-20 12:28 ` Chris Down
2021-07-21 8:57 ` Petr Mladek
2021-07-21 11:22 ` Chris Down
2021-07-21 12:49 ` Petr Mladek
2021-07-22 23:01 ` Stephen Rothwell
2021-07-23 11:14 ` Petr Mladek
2021-07-23 12:14 ` Chris Down
2020-07-29 11:03 Stephen Rothwell
2020-07-29 11:47 ` Herbert Xu
2020-07-28 1:49 Stephen Rothwell
2020-07-28 1:51 ` Herbert Xu
2020-07-28 2:21 ` Stephen Rothwell
2020-07-28 1:54 ` Sergey Senozhatsky
2020-07-28 2:24 ` Stephen Rothwell
2020-06-21 3:15 Stephen Rothwell
2020-06-21 3:26 ` Herbert Xu
2020-06-23 0:26 ` Stephen Rothwell
2020-06-23 12:16 ` Petr Mladek
2020-06-23 12:19 ` Herbert Xu
2020-06-23 14:28 ` Petr Mladek
2020-06-23 15:17 ` Peter Zijlstra
2020-06-24 8:22 ` Petr Mladek
2020-06-24 0:20 ` Herbert Xu
2020-06-24 8:19 ` Petr Mladek
2020-06-24 8:21 ` Herbert Xu
2018-03-02 5:07 Stephen Rothwell
2018-03-02 15:54 ` Petr Mladek
2018-03-03 2:43 ` Stephen Rothwell
2018-03-03 14:47 ` Sergey Senozhatsky
2018-03-05 3:20 ` Dave Young
2018-03-05 5:27 ` Greentime Hu
2018-03-05 5:41 ` Sergey Senozhatsky
2018-03-05 12:25 ` Petr Mladek
2017-12-07 0:37 Stephen Rothwell
2017-12-07 1:26 ` Sergey Senozhatsky
2017-12-07 13:12 ` Petr Mladek
2017-12-06 3:23 Stephen Rothwell
2017-12-06 4:28 ` Sergey Senozhatsky
2017-12-06 10:17 ` Petr Mladek
2017-12-06 10:39 ` Sergey Senozhatsky
2017-12-07 1:24 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191206092503.303d6a57@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=pmladek@suse$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=wangkefeng.wang@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox