diff options
Diffstat (limited to 'arch/i386/boot/compressed/misc.c')
-rw-r--r-- | arch/i386/boot/compressed/misc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c index cedc55cc47de..e1330766965c 100644 --- a/arch/i386/boot/compressed/misc.c +++ b/arch/i386/boot/compressed/misc.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <linux/vmalloc.h> | 13 | #include <linux/vmalloc.h> |
14 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
16 | #include <asm/page.h> | ||
16 | 17 | ||
17 | /* | 18 | /* |
18 | * gzip declarations | 19 | * gzip declarations |
@@ -308,7 +309,7 @@ static void setup_normal_output_buffer(void) | |||
308 | #else | 309 | #else |
309 | if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory"); | 310 | if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory"); |
310 | #endif | 311 | #endif |
311 | output_data = (char *)0x100000; /* Points to 1M */ | 312 | output_data = (char *)__PHYSICAL_START; /* Normally Points to 1M */ |
312 | free_mem_end_ptr = (long)real_mode; | 313 | free_mem_end_ptr = (long)real_mode; |
313 | } | 314 | } |
314 | 315 | ||
@@ -333,8 +334,8 @@ static void setup_output_buffer_if_we_run_high(struct moveparams *mv) | |||
333 | low_buffer_size = low_buffer_end - LOW_BUFFER_START; | 334 | low_buffer_size = low_buffer_end - LOW_BUFFER_START; |
334 | high_loaded = 1; | 335 | high_loaded = 1; |
335 | free_mem_end_ptr = (long)high_buffer_start; | 336 | free_mem_end_ptr = (long)high_buffer_start; |
336 | if ( (0x100000 + low_buffer_size) > ((ulg)high_buffer_start)) { | 337 | if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) { |
337 | high_buffer_start = (uch *)(0x100000 + low_buffer_size); | 338 | high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size); |
338 | mv->hcount = 0; /* say: we need not to move high_buffer */ | 339 | mv->hcount = 0; /* say: we need not to move high_buffer */ |
339 | } | 340 | } |
340 | else mv->hcount = -1; | 341 | else mv->hcount = -1; |