From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 23 May 2007 22:09:45 +0000 (+0000)
Subject: fix x86-2.6 compile
X-Git-Tag: reboot~29186
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=227d9b1b0ab6893dd29f28036e9aa0a1cb139819;p=oweals%2Fopenwrt.git

fix x86-2.6 compile

SVN-Revision: 7319
---

diff --git a/target/linux/generic-2.6/patches/600-x86_lzma.patch b/target/linux/generic-2.6/patches/600-x86_lzma.patch
index b84a03cf09..23191bc4fd 100644
--- a/target/linux/generic-2.6/patches/600-x86_lzma.patch
+++ b/target/linux/generic-2.6/patches/600-x86_lzma.patch
@@ -778,8 +778,8 @@ diff -Nur linux-2.6.21.1/arch/i386/boot/compressed/lzma_misc.c linux-2.6.21.1-ow
 +
 +static void putstr(const char *);
 +
-+extern int end;
-+static long free_mem_ptr = (long)&end;
++extern int _end;
++static long free_mem_ptr = (long)&_end;
 +static long free_mem_end_ptr;
 +
 +#define INPLACE_MOVE_ROUTINE  0x1000
@@ -788,7 +788,7 @@ diff -Nur linux-2.6.21.1/arch/i386/boot/compressed/lzma_misc.c linux-2.6.21.1-ow
 +#define HEAP_SIZE             0x3000
 +static unsigned int low_buffer_end, low_buffer_size;
 +static int high_loaded =0;
-+static uch *high_buffer_start /* = (uch *)(((ulg)&end) + HEAP_SIZE)*/;
++static uch *high_buffer_start /* = (uch *)(((ulg)&_end) + HEAP_SIZE)*/;
 +
 +static char *vidmem = (char *)0xb8000;
 +static int vidport;
@@ -902,7 +902,7 @@ diff -Nur linux-2.6.21.1/arch/i386/boot/compressed/lzma_misc.c linux-2.6.21.1-ow
 +
 +static void setup_output_buffer_if_we_run_high(struct moveparams *mv)
 +{
-+	high_buffer_start = (uch *)(((ulg)&end) + HEAP_SIZE);
++	high_buffer_start = (uch *)(((ulg)&_end) + HEAP_SIZE);
 +#ifdef STANDARD_MEMORY_BIOS_CALL
 +	if (RM_EXT_MEM_K < (3*1024)) error("Less than 4MB of memory");
 +#else