diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2017-10-10 09:42:39 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-10-16 09:42:51 -0400 |
| commit | c005f7edbbc41b33de2c5f8d31a8c12d86ffdb59 (patch) | |
| tree | f13b67d0ac156a12c85c9a5b7521f07eac2fee7e /fs | |
| parent | 41ba7f525fa21941dee062b87adbbd7dde72f32f (diff) | |
fs/jffs2/mini_inflate.c: use "static inline" instead of "inline"
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 <bunk@debian.org>
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jffs2/mini_inflate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c index 2f13412f98b..7bfbdb68019 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) { |