From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751889AbdBHVVA (ORCPT ); Wed, 8 Feb 2017 16:21:00 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:55513 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751011AbdBHVUx (ORCPT ); Wed, 8 Feb 2017 16:20:53 -0500 From: Arnd Bergmann To: Andrew Morton Cc: Arnd Bergmann , 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 Message-Id: <20170208211946.2839649-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:EYRacq7RyyhpaGZe927kU56L8N+tBhlsUJGU8I/Qvot/l8Weu+h Mk2XyzBjdsQKplr/mDdu2YMqG1EEsNd4xqO2m+D9MpOwf0TGWWsvBvcUDCl7eu8vFbKavLi rfmoGhONU2MndajVyPc5lV64Q/Bzdf+NIx48W0/RzDHRJ3U1X/gh/Y+dlP+h9wsAwTfv76g NwTG48OHLNifB//ApjhbA== X-UI-Out-Filterresults: notjunk:1;V01:K0:ROszSPqRMC8=:W9xeNOA6LnEY/HYhsxgiuU MxnTOwImYjUVmsH9xpq9OtWN9XZtHjzRZB82BVHbkE59u1wpbchNQ55+ZZ+O0XFvIJjI83UxL MnJiTOVVRVvidm8lPtL26f2bZYnQPXCKLaf//PQlCxcAKV3oZg135L42Ppm7u7NeESL2juyI/ yppnaa7ihgK7aHj9PZTGcfW4e0T1H920GIw6O0yNEpUd0mORChffPqVOvCSMcmYCyhqGox7UJ mlakIyituYJZSQ8EELQ98zBWFNNhgrgYvXhzUsoFk60ntNuaPq3Edv+ezSf3TTxOpDqhW+MVZ OD67JSaqJCnQcrMTOuGYCXGosjuZUjdYg+RqpWBLNz5jtQm5oBxA73mauNcxfhV8ABSfVzVX6 2erAApy3ozjg9y0bGgc0Nl4oxINpTtzotjSaaT5cAHT/j7iOsFiimMRg73Acz2+vTb4T6lcLt bSEsVsFLTe82O6xMJ1AFIn592TqOermUOhiL/OTY4KQbAKY/DAWcr8oqplvTxzoUsewC6xme4 oOttA8k7ecmDY0KhtWosuQZbvbW+3QgTWh4ggJY7bwWBHxZchdcEgQO5My1TY7pSHFrCYcNer sfQ0uqo+9aj4gdBcFcM7vcaT3VmRuz5NuUQLvwFMDlWXCEv5Dc5cMut4P3QbJm9N//LiHYLpC 68x9fz4pmjUQzgKKKxLVFNzYaJd/yDEiE2rPP+tuKVs3Pc/yfiRv7Z0SSdqL64PTgpvQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 #include +#ifdef STATIC +#undef EXPORT_SYMBOL +#define EXPORT_SYMBOL(x) +#endif + /*-***************************** * Decompression functions *******************************/ -- 2.9.0