SOURCES: kernel-grsec_full.patch - fix conflict with bzip2-lzma patch

[baggins]

Author: baggins                      Date: Tue Mar 31 15:50:07 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- fix conflict with bzip2-lzma patch

---- Files affected:
SOURCES:
   kernel-grsec_full.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kernel-grsec_full.patch
diff -u SOURCES/kernel-grsec_full.patch:1.2 SOURCES/kernel-grsec_full.patch:1.3
--- SOURCES/kernel-grsec_full.patch:1.2	Tue Mar 31 14:04:39 2009
+++ SOURCES/kernel-grsec_full.patch	Tue Mar 31 17:50:01 2009
@@ -4204,7 +4204,7 @@
 --- linux-2.6.29/arch/x86/include/asm/boot.h	2009-03-23 19:12:14.000000000 -0400
 +++ linux-2.6.29/arch/x86/include/asm/boot.h	2009-03-28 14:26:18.000000000 -0400
 @@ -11,10 +11,15 @@
- #define ASK_VGA		0xfffd		/* ask for it at bootup */
+ #ifdef __KERNEL__
  
  /* Physical address where kernel should be loaded. */
 -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
@@ -4217,9 +4217,9 @@
 +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
 +#endif
 +
- #ifdef CONFIG_X86_64
- #define BOOT_HEAP_SIZE	0x7000
- #define BOOT_STACK_SIZE	0x4000
+ #ifdef CONFIG_KERNEL_BZIP2
+ define BOOT_HEAP_SIZE             0x400000
+ #else /* !CONFIG_KERNEL_BZIP2 */
 diff -urNp linux-2.6.29/arch/x86/include/asm/cache.h linux-2.6.29/arch/x86/include/asm/cache.h
 --- linux-2.6.29/arch/x86/include/asm/cache.h	2009-03-23 19:12:14.000000000 -0400
 +++ linux-2.6.29/arch/x86/include/asm/cache.h	2009-03-28 14:26:18.000000000 -0400
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-grsec_full.patch?r1=1.2&r2=1.3&f=u