diff options
author | James Morris <jmorris@namei.org> | 2009-08-11 08:33:01 +1000 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-08-11 08:33:01 +1000 |
commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /lib/decompress_unlzma.c | |
parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
download | op-kernel-dev-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.zip op-kernel-dev-8b4bfc7feb005d84e2bd0831d8331a304e9d6483.tar.gz |
Merge branch 'master' into next
Diffstat (limited to 'lib/decompress_unlzma.c')
-rw-r--r-- | lib/decompress_unlzma.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c index 32123a1..0b954e0 100644 --- a/lib/decompress_unlzma.c +++ b/lib/decompress_unlzma.c @@ -29,12 +29,14 @@ *Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef STATIC +#ifdef STATIC +#define PREBOOT +#else #include <linux/decompress/unlzma.h> +#include <linux/slab.h> #endif /* STATIC */ #include <linux/decompress/mm.h> -#include <linux/slab.h> #define MIN(a, b) (((a) < (b)) ? (a) : (b)) @@ -543,9 +545,7 @@ STATIC inline int INIT unlzma(unsigned char *buf, int in_len, int ret = -1; set_error_fn(error_fn); - if (!flush) - in_len -= 4; /* Uncompressed size hack active in pre-boot - environment */ + if (buf) inbuf = buf; else @@ -645,4 +645,15 @@ exit_0: return ret; } -#define decompress unlzma +#ifdef PREBOOT +STATIC int INIT decompress(unsigned char *buf, int in_len, + int(*fill)(void*, unsigned int), + int(*flush)(void*, unsigned int), + unsigned char *output, + int *posp, + void(*error_fn)(char *x) + ) +{ + return unlzma(buf, in_len - 4, fill, flush, output, posp, error_fn); +} +#endif |