- fix conflict with bzip2-lzma patch

Changed files:
    kernel-grsec_full.patch -> 1.3

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 8f48ad0a893b269c8ce2edb0b41bc2b2ce6771e7..37296e6668574387e631b52e1ac3710720a678aa 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -4204,7 +4204,7 @@ diff -urNp linux-2.6.29/arch/x86/include/asm/boot.h linux-2.6.29/arch/x86/includ
 --- 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 @@ diff -urNp linux-2.6.29/arch/x86/include/asm/boot.h linux-2.6.29/arch/x86/includ
 +#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