summaryrefslogtreecommitdiff
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-05-23 22:09:45 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-05-23 22:09:45 +0000
commit227d9b1b0ab6893dd29f28036e9aa0a1cb139819 (patch)
tree49acdc86acbb7653d5eb3dcc534bf55436d9fd18 /target/linux
parent68adfabefb131bf3edc91a0e1bf59ab0cc165d27 (diff)
downloadmtk-20170518-227d9b1b0ab6893dd29f28036e9aa0a1cb139819.zip
mtk-20170518-227d9b1b0ab6893dd29f28036e9aa0a1cb139819.tar.gz
mtk-20170518-227d9b1b0ab6893dd29f28036e9aa0a1cb139819.tar.bz2
fix x86-2.6 compile
SVN-Revision: 7319
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic-2.6/patches/600-x86_lzma.patch8
1 files changed, 4 insertions, 4 deletions
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 b84a03c..23191bc 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