[PATCH] ARM: decompressor: add strlen prototype

Path	csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Arnd Bergmann <arnd@arndb.de>
Newsgroups	linux.kernel
Subject	[PATCH] ARM: decompressor: add strlen prototype
Date	Wed, 25 Jan 2017 23:30:02 +0100
Message-ID	<t3EeK-7H4-29@gated-at.bofh.it> (permalink)
X-Original-To	Russell King <linux@armlinux.org.uk>
X-Mailer	git-send-email 2.9.0
X-Provags-ID	V03:K0:LM0sno/nOFQIZ9kNtvtcMgCaMeSdxDFm60uiA+B0/ryns5J9oU/ 8SvUbzX7zNPLE0XoSePKPAus7sBc65k0f0GVKl5hdByQ4ttN1TpFB95ErXde1Tsuoue7qYY tTTOsWf+6potdCbsPQcH5qs00XujGc5ss4iBLShzHoW/MvNCn+16PYuRV5v0CAFsJIvvba3 tCYMsUddo5aZR3Bkw1dJA==
X-Ui-Out-Filterresults	notjunk:1;V01:K0:En/VFZceNeQ=:CjJIc8DrgdLjETrPftA4TR o+zg7H1QFzu6Mm0C12YQmL8M+v2rS8EhCJvHT44Ae6jFWJFgkbo4qaew4MceP46G+hKUYHz6o +0GzFtK9S71qX6tMEX1e+wPfRHCC0kdh5AL53id/4r+iMBfrI6HOGmy3V1zRZBkB8ue+RnOxP vBDne8aplVn8wV5BePIA2XGGQHZL6bUpWcxKFAiOqbqkNPDgXKa0Yuub077pU8mGIchSbFK46 s3Q3LbDxzLoW5ctBtffoRNRtANirGuN/hsZHWRrijJ17KprWhiA5xgKB+bkxRtpa3iN4DLQDF nkRwvXIb16P2596f5zqitbwvdVnPhnr7dO4M+48m8LzOhB+GSxt+ylkfzlf5KRejpncyEospw 1tMzP1mnpJcgt9khqf1fUIYTDYKBZcfMG+N6NAu6zV3TAVV5hg3aghq19Vx9/DxPFvPskw+4r 4I1Lm8/95ULB7zU1Qt8pNZxmVzXyrzRp/1NsyhHbiWilgY0jc33Z2QBA5lOc917QblJi6YTjh wMCtb6gi8rOvsvYPh/Ofic5v0tnOkDRYpSYRmtPzUN+M33yPcctJGFKF2RLURBnr+Fjv8zc78 gW1sUjSkguE80JAtW8pJRG+KwvRR9fPMvv0pJjPhJN7p/hBI/96bxWyoY+kTETgRbK3YufR/b XZ+51sL7jTioKmaGX865awk9UHIB6nYF43bT2lG1XilvfdA5ny7S8drw6zi6WIVL9+1I=
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	42
Organization	linux.* mail to news gateway
X-Original-Cc	Sven Schmidt <4sschmid@informatik.uni-hamburg.de>, Andrew Morton <akpm@linux-foundation.org>, Arnd Bergmann <arnd@arndb.de>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
X-Original-Date	Wed, 25 Jan 2017 23:24:33 +0100
X-Original-Message-ID	<20170125222442.1244908-1-arnd@arndb.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1567009

Show key headers only | View raw

The decompress.c file contains a declaration for strstr() so we can
include some compression library code.

With the updated LZ4 implementation, we run into the same problem again
for strlen():

In file included from ../include/linux/rcupdate.h:40:0,
                 from ../include/linux/srcu.h:33,
                 from ../include/linux/notifier.h:15,
                 from ../include/linux/memory_hotplug.h:6,
                 from ../include/linux/mmzone.h:749,
                 from ../include/linux/gfp.h:5,
                 from ../include/linux/kmod.h:22,
                 from ../include/linux/module.h:13,
                 from ../arch/arm/boot/compressed/../../../../lib/lz4/lz4_decompress.c:39,
                 from ../arch/arm/boot/compressed/../../../../lib/decompress_unlz4.c:13,
                 from ../arch/arm/boot/compressed/decompress.c:55:
include/linux/cpumask.h: In function 'cpumask_parse':
include/linux/cpumask.h:592:53: error: implicit declaration of function 'strlen';did you mean 'strstr'? [-Werror=implicit-function-declaration]

This adds another declaration to work around the new problem.

Fixes: ce83d9ab80d6 ("lib: update LZ4 compressor module")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/arm/boot/compressed/decompress.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index a0765e7ed6c7..ea7832702a8f 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -32,6 +32,7 @@ extern void error(char *);
 
 /* Not needed, but used in some headers pulled in by decompressors */
 extern char * strstr(const char * s1, const char *s2);
+extern size_t strlen(const char *s);
 
 #ifdef CONFIG_KERNEL_GZIP
 #include "../../../../lib/decompress_inflate.c"
-- 
2.9.0

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH] ARM: decompressor: add strlen prototype Arnd Bergmann <arnd@arndb.de> - 2017-01-25 23:30 +0100

csiph-web