From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Joe Perches <joe@perches.com>, Mike Frysinger <vapier@gentoo.org>,
Steven Miao <realmz6@gmail.com>
Subject: Re: linux-next: build failure after merge of the rcu tree
Date: Tue, 30 May 2017 11:40:50 +1000 [thread overview]
Message-ID: <20170530114050.2b702cc1@canb.auug.org.au> (raw)
In-Reply-To: <20170529211505.GP3956@linux.vnet.ibm.com>
Hi Paul,
On Mon, 29 May 2017 14:15:05 -0700 "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> wrote:
>
> Anyone see any other options?
I will add the following to linux-next today. If the Blackfin guys
agree (or come up with something better), you should get their acks and
then add it to your tree.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 May 2017 09:21:05 +1000
Subject: [PATCH] Revert "Blackfin: use more standard pr_fmt in the module loader"
This reverts commit b75a9e6bfba5c7343391ac1bacd44d6652dde8da.
It turns out (after all this time) that referencing a function parameter
from a global macro was a bit fragile.
This could probably be done better, but this fixes a build failure due
to a commit that adds a use of pr_alert in an include file.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/blackfin/kernel/module.c | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/arch/blackfin/kernel/module.c b/arch/blackfin/kernel/module.c
index 0188c933b155..adbbccc91fa1 100644
--- a/arch/blackfin/kernel/module.c
+++ b/arch/blackfin/kernel/module.c
@@ -4,7 +4,7 @@
* Licensed under the GPL-2 or later
*/
-#define pr_fmt(fmt) "module %s: " fmt, mod->name
+#define pr_fmt(fmt) "module %s: " fmt
#include <linux/moduleloader.h>
#include <linux/elf.h>
@@ -44,7 +44,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_inst_sram_alloc(s->sh_size);
mod->arch.text_l1 = dest;
if (dest == NULL) {
- pr_err("L1 inst memory allocation failed\n");
+ pr_err("L1 inst memory allocation failed\n",
+ mod->name);
return -1;
}
dma_memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -56,7 +57,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_sram_alloc(s->sh_size);
mod->arch.data_a_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ pr_err("L1 data memory allocation failed\n",
+ mod->name);
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -68,7 +70,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_sram_zalloc(s->sh_size);
mod->arch.bss_a_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ pr_err("L1 data memory allocation failed\n",
+ mod->name);
return -1;
}
@@ -77,7 +80,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_B_sram_alloc(s->sh_size);
mod->arch.data_b_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ pr_err("L1 data memory allocation failed\n",
+ mod->name);
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -87,7 +91,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l1_data_B_sram_alloc(s->sh_size);
mod->arch.bss_b_l1 = dest;
if (dest == NULL) {
- pr_err("L1 data memory allocation failed\n");
+ pr_err("L1 data memory allocation failed\n",
+ mod->name);
return -1;
}
memset(dest, 0, s->sh_size);
@@ -99,7 +104,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l2_sram_alloc(s->sh_size);
mod->arch.text_l2 = dest;
if (dest == NULL) {
- pr_err("L2 SRAM allocation failed\n");
+ pr_err("L2 SRAM allocation failed\n",
+ mod->name);
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -111,7 +117,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l2_sram_alloc(s->sh_size);
mod->arch.data_l2 = dest;
if (dest == NULL) {
- pr_err("L2 SRAM allocation failed\n");
+ pr_err("L2 SRAM allocation failed\n",
+ mod->name);
return -1;
}
memcpy(dest, (void *)s->sh_addr, s->sh_size);
@@ -123,7 +130,8 @@ module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs,
dest = l2_sram_zalloc(s->sh_size);
mod->arch.bss_l2 = dest;
if (dest == NULL) {
- pr_err("L2 SRAM allocation failed\n");
+ pr_err("L2 SRAM allocation failed\n",
+ mod->name);
return -1;
}
@@ -157,7 +165,7 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
Elf32_Sym *sym;
unsigned long location, value, size;
- pr_debug("applying relocate section %u to %u\n",
+ pr_debug("applying relocate section %u to %u\n", mod->name,
relsec, sechdrs[relsec].sh_info);
for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
@@ -174,14 +182,14 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
#ifdef CONFIG_SMP
if (location >= COREB_L1_DATA_A_START) {
- pr_err("cannot relocate in L1: %u (SMP kernel)\n",
- ELF32_R_TYPE(rel[i].r_info));
+ pr_err("cannot relocate in L1: %u (SMP kernel)",
+ mod->name, ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
#endif
pr_debug("location is %lx, value is %lx type is %d\n",
- location, value, ELF32_R_TYPE(rel[i].r_info));
+ mod->name, location, value, ELF32_R_TYPE(rel[i].r_info));
switch (ELF32_R_TYPE(rel[i].r_info)) {
@@ -201,11 +209,11 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
case R_BFIN_PCREL12_JUMP_S:
case R_BFIN_PCREL10:
pr_err("unsupported relocation: %u (no -mlong-calls?)\n",
- ELF32_R_TYPE(rel[i].r_info));
+ mod->name, ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
default:
- pr_err("unknown relocation: %u\n",
+ pr_err("unknown relocation: %u\n", mod->name,
ELF32_R_TYPE(rel[i].r_info));
return -ENOEXEC;
}
@@ -222,7 +230,8 @@ apply_relocate_add(Elf_Shdr *sechdrs, const char *strtab,
isram_memcpy((void *)location, &value, size);
break;
default:
- pr_err("invalid relocation for %#lx\n", location);
+ pr_err("invalid relocation for %#lx\n",
+ mod->name, location);
return -ENOEXEC;
}
}
--
2.11.0
--
Cheers,
Stephen Rothwell
next prev parent reply other threads:[~2017-05-30 1:40 UTC|newest]
Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-29 6:02 linux-next: build failure after merge of the rcu tree Stephen Rothwell
2017-05-29 21:15 ` Paul E. McKenney
2017-05-30 1:40 ` Stephen Rothwell [this message]
2017-05-30 1:54 ` Joe Perches
2017-05-30 2:14 ` Paul E. McKenney
2017-05-30 2:20 ` Joe Perches
2017-05-30 3:13 ` Stephen Rothwell
2017-05-30 4:10 ` Michael Ellerman
2017-06-02 17:51 ` Paul E. McKenney
-- strict thread matches above, loose matches on Subject: below --
2024-01-24 4:17 Stephen Rothwell
2024-01-24 9:49 ` Jiri Wiesner
2024-01-24 12:12 ` Paul E. McKenney
2024-01-24 13:31 ` Jiri Wiesner
2024-01-24 14:20 ` Paul E. McKenney
2023-07-27 4:19 Stephen Rothwell
2023-07-27 14:08 ` Paul E. McKenney
2023-05-19 0:59 Stephen Rothwell
2023-05-19 2:12 ` Paul E. McKenney
2023-05-22 1:45 ` Stephen Rothwell
2023-05-22 14:57 ` Paul E. McKenney
2023-03-14 1:29 Stephen Rothwell
2023-03-14 4:43 ` Paul E. McKenney
2022-10-17 23:26 Stephen Rothwell
2022-10-18 10:43 ` Frederic Weisbecker
2022-10-18 14:57 ` Paul E. McKenney
2022-04-19 2:36 Stephen Rothwell
2022-04-19 3:31 ` Paul E. McKenney
2021-05-03 0:11 Stephen Rothwell
2021-05-03 16:25 ` Paul E. McKenney
2021-04-22 4:10 Stephen Rothwell
2021-04-22 16:36 ` Paul E. McKenney
2021-03-17 5:36 Stephen Rothwell
2021-03-17 14:23 ` Paul E. McKenney
2021-01-04 0:37 Stephen Rothwell
2021-01-04 12:56 ` Frederic Weisbecker
2020-12-04 8:25 Stephen Rothwell
2020-12-04 19:20 ` Paul E. McKenney
2020-12-06 21:39 ` Stephen Rothwell
2020-12-07 4:48 ` Paul E. McKenney
2020-12-07 8:59 ` Stephen Rothwell
2020-09-17 5:19 Stephen Rothwell
2020-09-17 22:01 ` Paul E. McKenney
2020-09-18 0:00 ` Stephen Rothwell
2020-09-08 5:38 Stephen Rothwell
2020-09-08 13:54 ` Paul E. McKenney
2020-08-18 1:43 Stephen Rothwell
2020-08-18 14:08 ` Paul E. McKenney
2020-06-25 2:57 Stephen Rothwell
2020-06-25 3:45 ` Paul E. McKenney
2020-05-28 9:05 Stephen Rothwell
2020-05-28 16:33 ` Paul E. McKenney
2020-05-28 21:03 ` Paul E. McKenney
2020-04-05 1:49 Stephen Rothwell
2020-04-05 3:10 ` Paul E. McKenney
2020-01-17 3:07 Stephen Rothwell
2019-12-12 2:45 Stephen Rothwell
2019-12-12 4:07 ` Paul E. McKenney
2019-12-12 4:26 ` Stephen Rothwell
2019-12-12 4:41 ` Paul E. McKenney
2020-01-17 3:09 ` Stephen Rothwell
2019-08-13 7:57 Stephen Rothwell
2019-08-13 15:31 ` Paul E. McKenney
2019-08-12 6:12 Stephen Rothwell
2019-08-12 16:19 ` Paul E. McKenney
2019-08-13 5:25 ` Stephen Rothwell
2019-08-13 14:38 ` Paul E. McKenney
2017-09-04 4:50 Stephen Rothwell
2017-09-04 16:39 ` Paul E. McKenney
2017-08-28 4:25 Stephen Rothwell
2017-08-28 17:50 ` Paul E. McKenney
2017-08-11 4:43 Stephen Rothwell
2017-08-11 4:54 ` Paul E. McKenney
2017-08-11 9:14 ` Peter Zijlstra
2017-08-11 14:39 ` Paul E. McKenney
2017-08-11 14:45 ` Peter Zijlstra
2017-08-11 14:41 ` Peter Zijlstra
2017-08-11 20:12 ` Paul E. McKenney
2017-04-20 5:36 Stephen Rothwell
2017-04-20 14:23 ` Paul E. McKenney
2017-04-19 3:50 Stephen Rothwell
2017-04-19 4:06 ` Paul E. McKenney
2017-04-19 5:45 ` Stephen Rothwell
2017-03-08 1:16 Stephen Rothwell
2017-03-08 10:13 ` Daniel Vetter
2017-03-08 17:40 ` Paul E. McKenney
2017-01-19 3:34 Stephen Rothwell
2017-01-19 21:54 ` Paul McKenney
2017-02-13 2:21 ` Stephen Rothwell
2017-02-13 4:37 ` Paul E. McKenney
2017-02-13 6:43 ` Stephen Rothwell
2017-03-08 1:16 ` Stephen Rothwell
2017-03-08 1:37 ` Paul E. McKenney
2017-03-08 18:05 ` Paul E. McKenney
2016-05-02 4:37 Stephen Rothwell
2016-05-02 11:06 ` Paul E. McKenney
2016-02-01 2:55 Stephen Rothwell
2016-02-01 9:53 ` Paul E. McKenney
2016-01-07 8:57 Stephen Rothwell
2016-01-07 18:02 ` Paul E. McKenney
2016-01-07 20:19 ` Stephen Rothwell
2016-01-07 20:52 ` Paul E. McKenney
2016-01-08 1:37 ` Boqun Feng
2016-01-08 3:41 ` Paul E. McKenney
2016-01-08 4:08 ` Stephen Rothwell
2016-01-08 4:48 ` Paul E. McKenney
2016-01-08 4:54 ` Boqun Feng
2016-01-08 15:53 ` Paul E. McKenney
2016-01-08 15:57 ` Tejun Heo
2016-01-08 16:18 ` Paul E. McKenney
2016-01-08 15:58 ` Boqun Feng
2016-01-08 4:10 ` Stephen Rothwell
2015-09-01 3:50 Stephen Rothwell
2015-09-01 7:49 ` Paul E. McKenney
2015-09-02 3:58 ` Stephen Rothwell
2015-09-02 5:26 ` Paul E. McKenney
2015-09-02 6:40 ` Davidlohr Bueso
2015-09-02 7:14 ` Paul E. McKenney
2015-09-02 7:29 ` Ingo Molnar
2015-09-02 8:34 ` Paul E. McKenney
2015-07-16 3:14 Stephen Rothwell
2015-07-16 3:51 ` Paul E. McKenney
2015-07-16 5:50 ` Stephen Rothwell
2015-07-17 11:40 ` Ingo Molnar
2015-07-17 17:35 ` Paul E. McKenney
2015-07-17 18:53 ` Paul E. McKenney
2015-07-17 19:51 ` Ingo Molnar
2015-07-17 21:33 ` Paul E. McKenney
2015-07-18 2:40 ` Ingo Molnar
2015-04-13 10:39 Stephen Rothwell
2015-04-13 11:06 ` Borislav Petkov
2015-04-13 11:34 ` Ingo Molnar
2015-04-13 12:40 ` Paul E. McKenney
2015-02-27 2:18 Stephen Rothwell
2015-02-27 5:59 ` Paul E. McKenney
2014-12-26 7:51 Stephen Rothwell
2014-12-26 16:54 ` Paul E. McKenney
2014-12-27 16:24 ` Pranith Kumar
2014-12-27 17:20 ` Pranith Kumar
2014-12-31 1:45 ` Paul E. McKenney
2014-12-12 6:12 Stephen Rothwell
2014-12-12 17:23 ` Paul E. McKenney
2014-12-10 8:09 Stephen Rothwell
2014-12-10 15:03 ` Pranith Kumar
2014-12-10 15:18 ` Paul E. McKenney
2014-12-09 11:42 Stephen Rothwell
2014-12-09 14:07 ` Paul E. McKenney
2012-04-16 4:11 Stephen Rothwell
2012-04-16 17:02 ` Paul E. McKenney
2010-09-17 2:42 Stephen Rothwell
2010-09-17 4:39 ` David Miller
2010-09-17 5:34 ` Eric Dumazet
2010-09-17 23:17 ` Paul E. McKenney
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=20170530114050.2b702cc1@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=realmz6@gmail.com \
--cc=vapier@gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).