Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4c83d6536e7bcc8c0c1319c66337f3f2c89cd06a
Commit:     4c83d6536e7bcc8c0c1319c66337f3f2c89cd06a
Parent:     8751f97486e071b73240e0a0c08e3b663766e45f
Author:     Ian Campbell <[EMAIL PROTECTED]>
AuthorDate: Wed Jan 30 13:33:38 2008 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 13:33:38 2008 +0100

    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 <[EMAIL PROTECTED]>
    Cc: H. Peter Anvin <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
---
 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 ad0528a..2b1c22d 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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to