packages: kernel/kernel.spec, kernel/kernel-squashfs-lzma-fixes.patch (NEW)...

[arekm]

Author: arekm                        Date: Sat Mar  6 23:45:22 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- squashfs lzma fixes

---- Files affected:
packages/kernel:
   kernel.spec (1.763 -> 1.764) , kernel-squashfs-lzma-fixes.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.763 packages/kernel/kernel.spec:1.764
--- packages/kernel/kernel.spec:1.763	Sun Mar  7 00:16:51 2010
+++ packages/kernel/kernel.spec	Sun Mar  7 00:45:16 2010
@@ -294,6 +294,7 @@
 
 # was submitted at lkml
 Patch160:	kernel-squashfs-lzma.patch
+Patch161:	kernel-squashfs-lzma-fixes.patch
 
 Patch200:	kernel-ppc-ICE-hacks.patch
 
@@ -851,6 +852,7 @@
 #%patch150 -p1
 
 %patch160 -p1
+%patch161 -p1
 
 %ifarch ppc ppc64
 #patch200 -p1
@@ -1584,6 +1586,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.764  2010/03/06 23:45:16  arekm
+- squashfs lzma fixes
+
 Revision 1.763  2010/03/06 23:16:51  arekm
 - update squashfs-lzma
 

================================================================
Index: packages/kernel/kernel-squashfs-lzma-fixes.patch
diff -u /dev/null packages/kernel/kernel-squashfs-lzma-fixes.patch:1.1
--- /dev/null	Sun Mar  7 00:45:22 2010
+++ packages/kernel/kernel-squashfs-lzma-fixes.patch	Sun Mar  7 00:45:16 2010
@@ -0,0 +1,42 @@
+--- /dev/null	2007-02-13 17:29:53.000000000 +0100
++++ linux-2.6.33/include/linux/decompress/unlzo_mm.h	2010-03-07 00:37:54.257044457 +0100
+@@ -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
+--- linux-2.6.33/lib/decompress_unlzo.c~	2010-02-24 19:52:17.000000000 +0100
++++ linux-2.6.33/lib/decompress_unlzo.c	2010-03-07 00:41:28.523690104 +0100
+@@ -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,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.763&r2=1.764&f=u