diff options
| author | James Morris <[email protected]> | 2014-11-19 10:32:12 +0000 |
|---|---|---|
| committer | James Morris <[email protected]> | 2014-11-19 10:32:12 +0000 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /lib/decompress.c | |
| parent | integrity: do zero padding of the key id (diff) | |
| parent | Linux 3.17 (diff) | |
| download | kernel-b10778a00d40b3d9fdaaf5891e802794781ff71c.tar.gz kernel-b10778a00d40b3d9fdaaf5891e802794781ff71c.zip | |
Merge commit 'v3.17' into next
Diffstat (limited to 'lib/decompress.c')
| -rw-r--r-- | lib/decompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/decompress.c b/lib/decompress.c index 86069d74c062..37f3c786348f 100644 --- a/lib/decompress.c +++ b/lib/decompress.c @@ -54,7 +54,7 @@ static const struct compress_format compressed_formats[] __initconst = { { {0, 0}, NULL, NULL } }; -decompress_fn __init decompress_method(const unsigned char *inbuf, int len, +decompress_fn __init decompress_method(const unsigned char *inbuf, long len, const char **name) { const struct compress_format *cf; |