From: Ian Campbell Date: Wed, 30 Jan 2008 12:33:38 +0000 (+0100) Subject: x86: unify variable names in arch/x86/boot/compressed/misc_??.c X-Git-Tag: v2.6.25-rc1~1143^2~158 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4c83d6536e7bcc8c0c1319c66337f3f2c89cd06a;p=linux-2.6-omap-h63xx.git 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 Cc: H. Peter Anvin Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/boot/compressed/misc_32.c b/arch/x86/boot/compressed/misc_32.c index ad0528a8315..2b1c22de558 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) 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 *output) { @@ -366,15 +366,15 @@ asmlinkage void decompress_kernel(void *rmode, unsigned long end, cols = RM_SCREEN_INFO.orig_video_cols; window = output; /* Output buffer (Normally at 1M) */ - free_mem_ptr = end; /* Heap */ - free_mem_end_ptr = end + HEAP_SIZE; + free_mem_ptr = heap; /* Heap */ + free_mem_end_ptr = heap + HEAP_SIZE; inbuf = input_data; /* Input buffer */ insize = input_len; inptr = 0; if ((u32)output & (CONFIG_PHYSICAL_ALIGN -1)) 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"); #ifndef CONFIG_RELOCATABLE if ((u32)output != LOAD_PHYSICAL_ADDR)