Commit 4c83d653 authored by Ian Campbell's avatar Ian Campbell Committed by Ingo Molnar

x86: unify variable names in arch/x86/boot/compressed/misc_??.c

size reports no change in arch/x86/boot/compressed/vmlinux.
Signed-off-by: default avatarIan Campbell <ijc@hellion.org.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 8751f974
...@@ -348,7 +348,7 @@ static void error(char *x) ...@@ -348,7 +348,7 @@ static void error(char *x)
asm("hlt"); asm("hlt");
} }
asmlinkage void decompress_kernel(void *rmode, unsigned long end, asmlinkage void decompress_kernel(void *rmode, unsigned long heap,
uch *input_data, unsigned long input_len, uch *input_data, unsigned long input_len,
uch *output) uch *output)
{ {
...@@ -366,15 +366,15 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end, ...@@ -366,15 +366,15 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end,
cols = RM_SCREEN_INFO.orig_video_cols; cols = RM_SCREEN_INFO.orig_video_cols;
window = output; /* Output buffer (Normally at 1M) */ window = output; /* Output buffer (Normally at 1M) */
free_mem_ptr = end; /* Heap */ free_mem_ptr = heap; /* Heap */
free_mem_end_ptr = end + HEAP_SIZE; free_mem_end_ptr = heap + HEAP_SIZE;
inbuf = input_data; /* Input buffer */ inbuf = input_data; /* Input buffer */
insize = input_len; insize = input_len;
inptr = 0; inptr = 0;
if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1)) if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1))
error("Destination address not CONFIG_PHYSICAL_ALIGN aligned"); error("Destination address not CONFIG_PHYSICAL_ALIGN aligned");
if (end > ((-__PAGE_OFFSET-(512 <<20)-1) & 0x7fffffff)) if (heap > ((-__PAGE_OFFSET-(512<<20)-1) & 0x7fffffff))
error("Destination address too large"); error("Destination address too large");
#ifndef CONFIG_RELOCATABLE #ifndef CONFIG_RELOCATABLE
if ((u32)output != LOAD_PHYSICAL_ADDR) if ((u32)output != LOAD_PHYSICAL_ADDR)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment