kernel/kernel-2.6.33.5-squashfs-fixes.patch

45 lines
1.4 KiB
Diff

diff -Nru kernel-2.6.33mamba.orig//include/linux/decompress/unlzo_mm.h kernel-2.6.33mamba/include/linux/decompress/unlzo_mm.h
--- kernel-2.6.33mamba.orig//include/linux/decompress/unlzo_mm.h 1970-01-01 01:00:00.000000000 +0100
+++ kernel-2.6.33mamba/include/linux/decompress/unlzo_mm.h 2010-07-03 20:40:21.186641845 +0200
@@ -0,0 +1,20 @@
+#ifndef UNLZO_MM_H
+#define UNLZO_MM_H
+
+#ifdef STATIC
+
+/* Code active when included from pre-boot environment: */
+#define INIT
+
+#elif defined(CONFIG_DECOMPRESS_LZO_NEEDED)
+
+/* Make it available to non initramfs/initrd code */
+#define INIT
+#include <linux/module.h>
+#else
+
+/* Compile for initramfs/initrd code only */
+#define INIT __init
+#endif
+
+#endif
diff -Nru kernel-2.6.33mamba.orig//lib/decompress_unlzo.c kernel-2.6.33mamba/lib/decompress_unlzo.c
--- kernel-2.6.33mamba.orig//lib/decompress_unlzo.c 2010-02-24 19:52:17.000000000 +0100
+++ kernel-2.6.33mamba/lib/decompress_unlzo.c 2010-07-03 20:40:29.169641772 +0200
@@ -39,6 +39,7 @@
#include <linux/types.h>
#include <linux/lzo.h>
+#include <linux/decompress/unlzo_mm.h>
#include <linux/decompress/mm.h>
#include <linux/compiler.h>
@@ -87,7 +88,7 @@
return 1;
}
-STATIC inline int INIT unlzo(u8 *input, int in_len,
+STATIC int INIT unlzo(u8 *input, int in_len,
int (*fill) (void *, unsigned int),
int (*flush) (void *, unsigned int),
u8 *output, int *posp,