lkml.org 
[lkml]   [2008]   [Jan]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCHv2 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 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)
    --
    1.5.3.8


    \
     
     \ /
      Last update: 2008-01-28 09:53    [W:0.021 / U:79.692 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site