aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/compressed/misc_32.c
diff options
context:
space:
mode:
authorIan Campbell <ijc@hellion.org.uk>2008-01-30 07:33:38 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:38 -0500
commit4c83d6536e7bcc8c0c1319c66337f3f2c89cd06a (patch)
treed7dff69c1bb4ac342300632bbbb3b3c3bf2bfa49 /arch/x86/boot/compressed/misc_32.c
parent8751f97486e071b73240e0a0c08e3b663766e45f (diff)
x86: unify variable names in arch/x86/boot/compressed/misc_??.c
size reports no change in arch/x86/boot/compressed/vmlinux. Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/boot/compressed/misc_32.c')
-rw-r--r--arch/x86/boot/compressed/misc_32.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c
index ad0528a83151..2b1c22de558a 100644
--- a/arch/x86/boot/compressed/misc_32.c
+++ b/arch/x86/boot/compressed/misc_32.c
@@ -348,7 +348,7 @@ static void error(char *x)
348 asm("hlt"); 348 asm("hlt");
349} 349}
350 350
351asmlinkage void decompress_kernel(void *rmode, unsigned long end, 351asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
352 uch *input_data, unsigned long input_len, 352 uch *input_data, unsigned long input_len,
353 uch *output) 353 uch *output)
354{ 354{
@@ -366,15 +366,15 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,
366 cols = RM_SCREEN_INFO.orig_video_cols; 366 cols = RM_SCREEN_INFO.orig_video_cols;
367 367
368 window = output; /* Output buffer (Normally at 1M) */ 368 window = output; /* Output buffer (Normally at 1M) */
369 free_mem_ptr = end; /* Heap */ 369 free_mem_ptr = heap; /* Heap */
370 free_mem_end_ptr = end + HEAP_SIZE; 370 free_mem_end_ptr = heap + HEAP_SIZE;
371 inbuf = input_data; /* Input buffer */ 371 inbuf = input_data; /* Input buffer */
372 insize = input_len; 372 insize = input_len;
373 inptr = 0; 373 inptr = 0;
374 374
375 if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1)) 375 if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
376 error("Destination address not CONFIG_PHYSICAL_ALIGN aligned"); 376 error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
377 if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff)) 377 if (heap > ((-__PAGE_OFFSET-(512<<20)-1) & 0x7fffffff))
378 error("Destination address too large"); 378 error("Destination address too large");
379#ifndef CONFIG_RELOCATABLE 379#ifndef CONFIG_RELOCATABLE
380 if ((u32)output != LOAD_PHYSICAL_ADDR) 380 if ((u32)output != LOAD_PHYSICAL_ADDR)