From: Arnd Bergmann <arnd@arndb.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
Sven Schmidt <4sschmid@informatik.uni-hamburg.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH] lz4: fix KERNEL_LZ4 support
Date: Wed, 8 Feb 2017 22:19:23 +0100 [thread overview]
Message-ID: <20170208211946.2839649-1-arnd@arndb.de> (raw)
The updated lz4 library removed the #ifdef guards around the various
EXPORT_SYMBOL statements in the original kernel lz4 support, which broke
CONFIG_KERNEL_LZ4 on x86:
x86_64-linux-ld: -r and -pie may not be used together
scripts/Makefile.build:308: recipe for target 'arch/x86/boot/compressed/misc.o' failed
This uses a simpler way to do the same thing, by overriding the
EXPORT_SYMBOL macro.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
lib/lz4/lz4_decompress.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/lib/lz4/lz4_decompress.c b/lib/lz4/lz4_decompress.c
index 9bf918233749..a390f63bc475 100644
--- a/lib/lz4/lz4_decompress.c
+++ b/lib/lz4/lz4_decompress.c
@@ -40,6 +40,11 @@
#include <linux/kernel.h>
#include <asm/unaligned.h>
+#ifdef STATIC
+#undef EXPORT_SYMBOL
+#define EXPORT_SYMBOL(x)
+#endif
+
/*-*****************************
* Decompression functions
*******************************/
--
2.9.0
next reply other threads:[~2017-02-08 21:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-08 21:19 Arnd Bergmann [this message]
2017-02-08 21:34 ` Andrew Morton
2017-02-08 22:06 ` Arnd Bergmann
2017-02-09 11:09 ` Sven Schmidt
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=20170208211946.2839649-1-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=4sschmid@informatik.uni-hamburg.de \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®