From: Arnd Bergmann <arnd@arndb.de>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>,
linux-kbuild@vger.kernel.org,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Nicolas Pitre <nico@linaro.org>,
Russell King <rmk+kernel@arm.linux.org.uk>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH] modpost: add .text.fixup to OTHER_TEXT_SECTIONS
Date: Wed, 15 Apr 2015 11:48:31 +0200 [thread overview]
Message-ID: <5641468.B6ky8Ch4vY@wuerfel> (raw)
Two correct patches for the 4.1 release clashed in a way that
caused modpost to fail badly, with hundreds warnings like
WARNING: vmlinux.o(__ex_table+0x1014): Section mismatch in reference from the (unknown reference) (unknown) to the (unknown reference) .text.fixup:(unknown)
The fix, as suggested by the warnings, is to add the new .text.fixup
section into the OTHER_TEXT_SECTIONS list.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 52dc0595d540 ("modpost: handle relocations mismatch in __ex_table")
Fixes: c4a84ae39b4a ("ARM: 8322/1: keep .text and .fixup regions closer together")
---
The mostpost patch has not made it into 4.1 yet, so it's probably best to
add this fix on top of that to avoid breaking when Linus pulls it in.
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index cbd53e08769d..dd7efba020a1 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -876,7 +876,7 @@ static void check_section(const char *modname, struct elf_info *elf,
#define TEXT_SECTIONS ".text", ".text.unlikely", ".sched.text", \
".kprobes.text"
#define OTHER_TEXT_SECTIONS ".ref.text", ".head.text", ".spinlock.text", \
- ".fixup", ".entry.text"
+ ".fixup", ".text.fixup", ".entry.text"
#define INIT_SECTIONS ".init.*"
#define MEM_INIT_SECTIONS ".meminit.*"
next reply other threads:[~2015-04-15 9:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 9:48 Arnd Bergmann [this message]
2015-04-15 10:40 ` [PATCH] modpost: add .text.fixup to OTHER_TEXT_SECTIONS Arnd Bergmann
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=5641468.B6ky8Ch4vY@wuerfel \
--to=arnd@arndb.de \
--cc=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nico@linaro.org \
--cc=quentin.casasnovas@oracle.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=rusty@rustcorp.com.au \
/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