diff options
Diffstat (limited to 'arch/i386/boot/compressed/misc.c')
-rw-r--r-- | arch/i386/boot/compressed/misc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/boot/compressed/misc.c b/arch/i386/boot/compressed/misc.c index b2ccd543410d..20970ff44119 100644 --- a/arch/i386/boot/compressed/misc.c +++ b/arch/i386/boot/compressed/misc.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/vmalloc.h> | 13 | #include <linux/vmalloc.h> |
14 | #include <linux/screen_info.h> | 14 | #include <linux/screen_info.h> |
15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
16 | #include <asm/page.h> | ||
17 | 16 | ||
18 | /* | 17 | /* |
19 | * gzip declarations | 18 | * gzip declarations |
@@ -303,7 +302,7 @@ static void setup_normal_output_buffer(void) | |||
303 | #else | 302 | #else |
304 | if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory"); | 303 | if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory"); |
305 | #endif | 304 | #endif |
306 | output_data = (unsigned char *)__PHYSICAL_START; /* Normally Points to 1M */ | 305 | output_data = (unsigned char *)CONFIG_PHYSICAL_START; /* Normally Points to 1M */ |
307 | free_mem_end_ptr = (long)real_mode; | 306 | free_mem_end_ptr = (long)real_mode; |
308 | } | 307 | } |
309 | 308 | ||
@@ -326,8 +325,8 @@ static void setup_output_buffer_if_we_run_high(struct moveparams *mv) | |||
326 | low_buffer_size = low_buffer_end - LOW_BUFFER_START; | 325 | low_buffer_size = low_buffer_end - LOW_BUFFER_START; |
327 | high_loaded = 1; | 326 | high_loaded = 1; |
328 | free_mem_end_ptr = (long)high_buffer_start; | 327 | free_mem_end_ptr = (long)high_buffer_start; |
329 | if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) { | 328 | if ( (CONFIG_PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) { |
330 | high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size); | 329 | high_buffer_start = (uch *)(CONFIG_PHYSICAL_START + low_buffer_size); |
331 | mv->hcount = 0; /* say: we need not to move high_buffer */ | 330 | mv->hcount = 0; /* say: we need not to move high_buffer */ |
332 | } | 331 | } |
333 | else mv->hcount = -1; | 332 | else mv->hcount = -1; |