KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix x86-2.6 compile

Browse source 
SVN-Revision: 7319
This commit is contained in:
Felix Fietkau 2007-05-23 22:09:45 +00:00
parent 68adfabefb
commit 227d9b1b0a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
target/linux/generic-2.6/patches/600-x86_lzma.patch
View file

@ -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 *); +static void putstr(const char *);
+ +
+extern int end; +extern int _end;
+static long free_mem_ptr = (long)&end; +static long free_mem_ptr = (long)&_end;
+static long free_mem_end_ptr; +static long free_mem_end_ptr;
+ +
+#define INPLACE_MOVE_ROUTINE 0x1000 +#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 +#define HEAP_SIZE 0x3000
+static unsigned int low_buffer_end, low_buffer_size; +static unsigned int low_buffer_end, low_buffer_size;
+static int high_loaded =0; +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 char *vidmem = (char *)0xb8000;
+static int vidport; +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) +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 +#ifdef STANDARD_MEMORY_BIOS_CALL
+ if (RM_EXT_MEM_K < (3*1024)) error("Less than 4MB of memory"); + if (RM_EXT_MEM_K < (3*1024)) error("Less than 4MB of memory");
+#else +#else