From patchwork Tue Oct 10 16:42:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 823930 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yBNG34TkHz9tYT for ; Wed, 11 Oct 2017 03:43:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id EBD0BC21DC1; Tue, 10 Oct 2017 16:42:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 54262C21C51; Tue, 10 Oct 2017 16:42:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D774CC21C51; Tue, 10 Oct 2017 16:42:49 +0000 (UTC) Received: from cascadia.aikidev.net (cascadia.aikidev.net [173.255.214.101]) by lists.denx.de (Postfix) with ESMTP id 57C6FC21C26 for ; Tue, 10 Oct 2017 16:42:49 +0000 (UTC) Received: from localhost (unknown [75.164.166.0]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id F12AE1AB09; Tue, 10 Oct 2017 09:42:47 -0700 (PDT) From: Vagrant Cascadian To: u-boot@lists.denx.de Date: Tue, 10 Oct 2017 09:42:39 -0700 Message-Id: <20171010164239.25453-1-vagrant@debian.org> X-Mailer: git-send-email 2.11.0 Cc: Vagrant Cascadian , Adrian Bunk Subject: [U-Boot] [PATCH] fs/jffs2/mini_inflate.c: use "static inline" instead of "inline" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This makes gcc no longer expect an out-of-line version of the functions being present elsewhere. This fixes a failure to build on several marvell targets with gcc-7 on Debian: https://bugs.debian.org/877963 Signed-off-by: Adrian Bunk Signed-off-by: Vagrant Cascadian --- fs/jffs2/mini_inflate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c index 2f13412f98..7bfbdb6801 100644 --- a/fs/jffs2/mini_inflate.c +++ b/fs/jffs2/mini_inflate.c @@ -16,7 +16,7 @@ static unsigned char huffman_order[] = {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; -inline void cramfs_memset(int *s, const int c, size n) +static inline void cramfs_memset(int *s, const int c, size n) { n--; for (;n > 0; n--) s[n] = c; @@ -65,8 +65,8 @@ static void init_stream(struct bitstream *stream, unsigned char *data, /* pull 'bits' bits out of the stream. The last bit pulled it returned as the * msb. (section 3.1.1) */ -inline unsigned long pull_bits(struct bitstream *stream, - const unsigned int bits) +static inline unsigned long pull_bits(struct bitstream *stream, + const unsigned int bits) { unsigned long ret; int i; @@ -85,7 +85,7 @@ inline unsigned long pull_bits(struct bitstream *stream, return ret; } -inline int pull_bit(struct bitstream *stream) +static inline int pull_bit(struct bitstream *stream) { int ret = ((*(stream->data) >> stream->bit) & 1); if (stream->bit++ == 7) {