summaryrefslogtreecommitdiff
path: root/include/linux/decompress/mm.h
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-01-13 04:01:14 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 19:03:23 +0300
commit93685ad247ef65b7d6f90ffe97b44f5cfeaf40d3 (patch)
tree979868b5a03a7e73c792e222646a1876b3dc0216 /include/linux/decompress/mm.h
parent6b01ed64c19b52121a717274d271d9915f8d3e94 (diff)
downloadlinux-93685ad247ef65b7d6f90ffe97b44f5cfeaf40d3.tar.xz
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/mm.h')
-rw-r--r--include/linux/decompress/mm.h5
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)
#define large_malloc(a) malloc(a)
#define large_free(a) free(a)
-#define set_error_fn(x)
-
#define INIT
#else /* STATIC */
@@ -84,9 +82,6 @@ static void free(void *where)
#define large_malloc(a) vmalloc(a)
#define large_free(a) vfree(a)
-static void(*error)(char *m);
-#define set_error_fn(x) error = x;
-
#define INIT __init
#define STATIC