From patchwork Fri Jun 30 15:38:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 106718 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2490563qge; Fri, 30 Jun 2017 08:39:57 -0700 (PDT) X-Received: by 10.98.138.143 with SMTP id o15mr22850708pfk.125.1498837196757; Fri, 30 Jun 2017 08:39:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498837196; cv=none; d=google.com; s=arc-20160816; b=T2E3WJL8MUMdzivs4J4j53M892m/1w01ugIuf0jEwbq/SvdxurB3n/u/AN9oYQRK6X iOE10Vfh8Vx9yGoDeT73AVEgbxB1fRUwqAfPBXVB+IpnZ6WfuEYIb374QL82+FMjPrbj FtXE4Blln+rIFzyNuVRbUpQ2QTK1ZvrEqNVu4O6k87QDeHT/uZaHxhtztH2nWIKJFZuo dhdcfBuau2oW94ASkvsIZ8T9GuT9Ah2gSzNu9sg/AQOgg6D9YbV4OFBvIDIBuQuIFCy5 tqftTEU1b+T3jB/e3DxsDzNl/UvL1yhNisfbgId6YTvd6YuBuDr3UCm2VpXLsdewZ5m/ HzUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=GK/tWJGycbP3rMQypBOa/QVcW/AlDktv8/ti/aoHCYM=; b=NQhPtX75/gpqTibAR0MJyYS/keIM6iSH8uxH+flboS+GmI9CkqBFiYdeklZmwV17Qp BugTii5cNBUbkGjyaoTpzKaOmL+elNyXG68TEBGs7Mf5aEYLgEcjyN83/xJ6Gq3aF7y8 BD94k6cG/5ntNZn/KRS+Tpz3pGVD6VNHolCZAMYXM2a8Glye3cwNdYHLfGXIiRt2E+tG s3+KGZ0tpXPlgO+caJ4elsIYiw+xdYltZMb8h9a2MA+00tzlY2w5aSMiVmxmzR+UFIcq +dAzvFmmPvyWzC3fYtKMRAPPg6bgsCFJXBtFk6T18nzxyr2OKizKwXotz9nOXHP1hK6l 5FRg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g5si6514832plj.193.2017.06.30.08.39.56; Fri, 30 Jun 2017 08:39:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751905AbdF3Pjn (ORCPT + 25 others); Fri, 30 Jun 2017 11:39:43 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:64632 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751625AbdF3Pjm (ORCPT ); Fri, 30 Jun 2017 11:39:42 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue005 [212.227.15.129]) with ESMTPA (Nemesis) id 0MMrhT-1dNOIi3eEp-008cB5; Fri, 30 Jun 2017 17:39:11 +0200 From: Arnd Bergmann To: Matthew Wilcox , Andrew Morton Cc: Arnd Bergmann , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] ARM: decompressor: add a memcmp() declaration Date: Fri, 30 Jun 2017 17:38:39 +0200 Message-Id: <20170630153908.3439707-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:AnclaeCjX7LzzXPUFaxsDaZg6NctJOHb/pve24LOzeJLQNW14XY 6jbN9RP6T9SP35sxR+KIkbwxY/T8xeIPUytHBFd9ys1JUgo9hy0aUkg3ZjSazsOsx/MZ2Pw 5/giSKJqTea65Lmdu32vAI+3ehEeMiKz8Mp6seV9TJ0o5EF+8MziQQvCKaqJeHreIE8jBiE vQBr4QgVmapjv4Zjjv6sQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:fInWpPrGzzA=:N/TA16NDT476fu+iaDnGln lofmfpu78/HlbEiSo4hZZ6tuVLUASTQaPDZpC5JUbyb6xhZz/556/HgSDvyxWKA8Ti+vpjFqV NoYs9+u18KykdXVcEBdBG4G9nwSqES/SuEjCTSrYlK4ewRZE7dqr3aSs68Q9KU58bHW2S0BCf ln6/+7/BvTpSaSse4XXrHyfCXm+8fXFBXcL0JL5IiwNGWdis65oYJwC282JHS4uIFj7vIKP3Q gBrT541hrL75NSe/tKUHSTmZZsEQQMnuLuEodC54xC1Bw1rSH3wmlGh6EVKA1Pkut0dylMEk3 lgDJdcaoeY6L8D3bW4qnwL0qdE7cemk/Et/HjZLBu4eFmhuaqZFy9rK6W6l7yqVbgQuc8g66D B/meO25kUfxaKUg9BaMBDqYxF9gW6ubQHIQhI6XPymCpnzZxBVHsJdSW8PzjVz8iBC36xdq0U kGZ/JopTDna0CHv476HFoWs/9eHR4y4yiLcOiB5sBTZdo3KNzXKISX00Dd0b/86mDupsI1MbJ zKqg99WV24jR59PD25911BQUSLSNwQpUcs6zWsyP9D6VP+lrLZ0oao0VsQ0KCsE6lOzirYJNO GClCWjAN8LKhEBnK+vPw4CxL7hnutD2n4d/FVQ86sCcRru5jTnM8ECr15XyS1tmXQyRnXfaYT sYnYTC0rXNaJI/ChJFPHYQR9ZQcUE3z4WbTGTWMpRR8EyutP17c1wa5oh+9SyuYayJoQ= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A reference to memcmp() was added to bitmap.h, which causes another build warning in the decompressor due to the incompatibility with the regular kernel string functions: In file included from /git/arm-soc/include/linux/nodemask.h:94:0, from /git/arm-soc/include/linux/mmzone.h:16, from /git/arm-soc/include/linux/gfp.h:5, from /git/arm-soc/include/linux/kmod.h:22, from /git/arm-soc/include/linux/module.h:13, from /git/arm-soc/arch/arm/boot/compressed/../../../../lib/lz4/lz4_decompress.c:39, from /git/arm-soc/arch/arm/boot/compressed/../../../../lib/decompress_unlz4.c:13, from /git/arm-soc/arch/arm/boot/compressed/decompress.c:56: include/linux/bitmap.h: In function 'bitmap_equal': include/linux/bitmap.h:270:11: error: implicit declaration of function 'memcmp'; did you mean 'memchr'? [-Werror=implicit-function-declaration] This adds one more declaration along with the existing ones. It would be nice to find a more generic solution here so we don't have to do this again the next time, but I couldn't think of a good way to do that. Fixes: 2118d3a701a8 ("bitmap: Use memcmp optimisation in more situations") Signed-off-by: Arnd Bergmann --- The patch causing it is currently in linux-next through mmotm, so I'd expect the fix to go through the same tree, provided Russell is ok with it. --- arch/arm/boot/compressed/decompress.c | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c index ea7832702a8f..f3a4bedd1afc 100644 --- a/arch/arm/boot/compressed/decompress.c +++ b/arch/arm/boot/compressed/decompress.c @@ -33,6 +33,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); +extern int memcmp(const void *cs, const void *ct, size_t count); #ifdef CONFIG_KERNEL_GZIP #include "../../../../lib/decompress_inflate.c"