From: Arnd Bergmann <arnd@arndb.de>
To: Russell King <linux@armlinux.org.uk>
Cc: "Uwe Kleine-König" <uwe@kleine-koenig.org>,
"Nicolas Pitre" <nico@linaro.org>,
linux-arm-kernel@lists.infradead.org,
"Nicholas Piggin" <npiggin@gmail.com>,
viro@zeniv.linux.org.uk, linux-kbuild@vger.kernel.org,
linux-arch@vger.kernel.org, regressions@leemhuis.info,
"Arnd Bergmann" <arnd@arndb.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] kbuild: provide include/asm/asm-prototypes.h for ARM
Date: Tue, 22 Nov 2016 12:05:40 +0100 [thread overview]
Message-ID: <20161122110557.1533467-1-arnd@arndb.de> (raw)
This adds an asm/asm-prototypes.h header for ARM to fix the broken symbol
versioning for symbols exported from assembler files.
I couldn't find the correct prototypes for the compiler builtins,
so I went with the fake 'void f(void)' prototypes that we had
before, restoring the state before they were moved.
Originally I assumed that the problem was just a harmless warning
in unusual configurations, but as Uwe found, we actually need this
to load most modules when symbol versioning is enabled, as it is
in many distro kernels.
Cc: Uwe Kleine-König <uwe@kleine-koenig.org>
Fixes: 4dd1837d7589 ("arm: move exports to definitions")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Compared to the earlier version, I dropped the changes to the
csumpartial files, which now get handled correctly by Kbuild
even when the export comes from a macro, and I also dropped the
changes to the bitops files, which were already fixed in a
patch from Nico.
The patch applies cleanly on top of the rmk/fixes tree but has
no effect there, as it also needs 4efca4ed05cb ("kbuild: modversions
for EXPORT_SYMBOL() for asm") and cc6acc11cad1 ("kbuild: be more
careful about matching preprocessed asm ___EXPORT_SYMBOL").
With the combination of rmk/fixes, torvalds/master and these two
patches, symbol versioning works again on ARM. As it is still
broken on almost all other architectures (powerpc is fixed,
x86 has a patch), I wonder if we should make CONFIG_MODVERSIONS
as broken for everything else.
---
arch/arm/include/asm/asm-prototypes.h | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
create mode 100644 arch/arm/include/asm/asm-prototypes.h
diff --git a/arch/arm/include/asm/asm-prototypes.h b/arch/arm/include/asm/asm-prototypes.h
new file mode 100644
index 000000000000..04e5616a7b15
--- /dev/null
+++ b/arch/arm/include/asm/asm-prototypes.h
@@ -0,0 +1,34 @@
+#include <linux/arm-smccc.h>
+#include <linux/bitops.h>
+#include <linux/ftrace.h>
+#include <linux/io.h>
+#include <linux/platform_data/asoc-imx-ssi.h>
+#include <linux/string.h>
+#include <linux/uaccess.h>
+
+#include <asm/checksum.h>
+#include <asm/div64.h>
+#include <asm/memory.h>
+
+extern void __aeabi_idivmod(void);
+extern void __aeabi_idiv(void);
+extern void __aeabi_lasr(void);
+extern void __aeabi_llsl(void);
+extern void __aeabi_llsr(void);
+extern void __aeabi_lmul(void);
+extern void __aeabi_uidivmod(void);
+extern void __aeabi_uidiv(void);
+extern void __aeabi_ulcmp(void);
+
+extern void __ashldi3(void);
+extern void __ashrdi3(void);
+extern void __bswapdi2(void);
+extern void __bswapsi2(void);
+extern void __divsi3(void);
+extern void __do_div64(void);
+extern void __lshrdi3(void);
+extern void __modsi3(void);
+extern void __muldi3(void);
+extern void __ucmpdi2(void);
+extern void __udivsi3(void);
+extern void __umodsi3(void);
--
2.9.0
next reply other threads:[~2016-11-22 11:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 11:05 Arnd Bergmann [this message]
2016-11-22 11:05 ` [PATCH 2/2] ARM: move mmiocpy/mmioset exports to io.c Arnd Bergmann
2016-11-22 11:05 ` Arnd Bergmann
2016-11-22 16:34 ` [PATCH 1/2] kbuild: provide include/asm/asm-prototypes.h for ARM Nicolas Pitre
2016-11-22 16:34 ` Nicolas Pitre
2016-11-23 0:41 ` Russell King - ARM Linux
2016-11-23 0:41 ` Russell King - ARM Linux
2016-11-23 1:40 ` Nicholas Piggin
2016-11-23 1:04 ` Nicholas Piggin
2016-11-23 1:04 ` Nicholas Piggin
2016-11-23 1:35 ` Nicolas Pitre
2016-11-23 9:33 ` Russell King - ARM Linux
2016-11-23 9:33 ` Russell King - ARM Linux
2016-11-23 10:36 ` Russell King - ARM Linux
2016-11-23 10:36 ` Russell King - ARM Linux
2016-11-27 2:33 ` Nicolas Pitre
2016-11-27 2:33 ` Nicolas Pitre
[not found] <20161017065131.GA27863@angband.pl>
2016-10-20 4:08 ` [PATCH] " Nicholas Piggin
2016-10-24 15:04 ` Arnd Bergmann
2016-10-24 15:05 ` [PATCH 1/2] " Arnd Bergmann
2016-10-24 15:05 ` Arnd Bergmann
2016-10-25 8:32 ` Nicholas Piggin
2016-11-20 13:21 ` Russell King - ARM Linux
2016-11-20 18:32 ` Linus Torvalds
2016-11-20 19:12 ` Russell King - ARM Linux
2016-11-20 19:12 ` Russell King - ARM Linux
2016-11-21 6:10 ` Nicholas Piggin
2016-11-21 6:10 ` Nicholas Piggin
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=20161122110557.1533467-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=nico@linaro.org \
--cc=npiggin@gmail.com \
--cc=regressions@leemhuis.info \
--cc=uwe@kleine-koenig.org \
--cc=viro@zeniv.linux.org.uk \
/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).