Messages in this thread Patch in this message | | | From | Ian Campbell <> | Date | Sat, 26 Jan 2008 11:54:12 +0000 | Subject | [PATCH 8/9] 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: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> --- arch/x86/boot/compressed/misc_32.c | 8 ++++---- 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 7522b64..9f963af 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) -- 1.5.3.8
| |