diff options
author | Lasse Collin <lasse.collin@tukaani.org> | 2011-01-12 20:01:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 11:03:23 -0500 |
commit | 93685ad247ef65b7d6f90ffe97b44f5cfeaf40d3 (patch) | |
tree | 979868b5a03a7e73c792e222646a1876b3dc0216 /include/linux/decompress | |
parent | 6b01ed64c19b52121a717274d271d9915f8d3e94 (diff) |
Decompressors: get rid of set_error_fn() macro
set_error_fn() has become a useless complication after c1e7c3ae59
("bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure") fixed
the use of error() in malloc(). Only decompress_unlzma.c had some use for
it and that was easy to change too.
This also gets rid of the static function pointer "error", which
should have been marked as __initdata.
Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alain Knaff <alain@knaff.lu>
Cc: Albin Tonnerre <albin.tonnerre@free-electrons.com>
Cc: Phillip Lougher <phillip@lougher.demon.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/decompress')
-rw-r--r-- | include/linux/decompress/mm.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h index ad5ec1d0475e..a31e9820710a 100644 --- a/include/linux/decompress/mm.h +++ b/include/linux/decompress/mm.h | |||
@@ -61,8 +61,6 @@ static void free(void *where) | |||
61 | #define large_malloc(a) malloc(a) | 61 | #define large_malloc(a) malloc(a) |
62 | #define large_free(a) free(a) | 62 | #define large_free(a) free(a) |
63 | 63 | ||
64 | #define set_error_fn(x) | ||
65 | |||
66 | #define INIT | 64 | #define INIT |
67 | 65 | ||
68 | #else /* STATIC */ | 66 | #else /* STATIC */ |
@@ -84,9 +82,6 @@ static void free(void *where) | |||
84 | #define large_malloc(a) vmalloc(a) | 82 | #define large_malloc(a) vmalloc(a) |
85 | #define large_free(a) vfree(a) | 83 | #define large_free(a) vfree(a) |
86 | 84 | ||
87 | static void(*error)(char *m); | ||
88 | #define set_error_fn(x) error = x; | ||
89 | |||
90 | #define INIT __init | 85 | #define INIT __init |
91 | #define STATIC | 86 | #define STATIC |
92 | 87 | ||