lkml.org 
[lkml]   [2008]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] Use structs instead of hardcoded offsets in x86 boot decompressor.
    Date
    Signed-off-by: Kristian Høgsberg <krh@redhat.com>
    ---
    arch/x86/boot/compressed/misc.c | 26 +++++++++++---------------
    1 files changed, 11 insertions(+), 15 deletions(-)

    diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
    index 90456ce..0d03579 100644
    --- a/arch/x86/boot/compressed/misc.c
    +++ b/arch/x86/boot/compressed/misc.c
    @@ -30,6 +30,7 @@
    #include <asm/io.h>
    #include <asm/page.h>
    #include <asm/boot.h>
    +#include <asm/bootparam.h>

    /* WARNING!!
    * This code is compiled with -fPIC and it is relocated dynamically
    @@ -187,13 +188,8 @@ static void gzip_release(void **);
    /*
    * This is set up by the setup-routine at boot-time
    */
    -static unsigned char *real_mode; /* Pointer to real-mode data */
    -
    -#define RM_EXT_MEM_K (*(unsigned short *)(real_mode + 0x2))
    -#ifndef STANDARD_MEMORY_BIOS_CALL
    -#define RM_ALT_MEM_K (*(unsigned long *)(real_mode + 0x1e0))
    -#endif
    -#define RM_SCREEN_INFO (*(struct screen_info *)(real_mode+0))
    +static struct boot_params *real_mode; /* Pointer to real-mode data */
    +static struct screen_info *rm_screen_info; /* Pointer to real-mode data */

    extern unsigned char input_data[];
    extern int input_len;
    @@ -276,12 +272,12 @@ static void putstr(const char *s)
    char c;

    #ifdef CONFIG_X86_32
    - if (RM_SCREEN_INFO.orig_video_mode == 0 && lines == 0 && cols == 0)
    + if (rm_screen_info->orig_video_mode == 0 && lines == 0 && cols == 0)
    return;
    #endif

    - x = RM_SCREEN_INFO.orig_x;
    - y = RM_SCREEN_INFO.orig_y;
    + x = rm_screen_info->orig_x;
    + y = rm_screen_info->orig_y;

    while ((c = *s++) != '\0') {
    if (c == '\n') {
    @@ -302,8 +298,8 @@ static void putstr(const char *s)
    }
    }

    - RM_SCREEN_INFO.orig_x = x;
    - RM_SCREEN_INFO.orig_y = y;
    + rm_screen_info->orig_x = x;
    + rm_screen_info->orig_y = y;

    pos = (x + cols * y) * 2; /* Update cursor position */
    outb(14, vidport);
    @@ -430,7 +426,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
    {
    real_mode = rmode;

    - if (RM_SCREEN_INFO.orig_video_mode == 7) {
    + if (rm_screen_info->orig_video_mode == 7) {
    vidmem = (char *) 0xb0000;
    vidport = 0x3b4;
    } else {
    @@ -438,8 +434,8 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
    vidport = 0x3d4;
    }

    - lines = RM_SCREEN_INFO.orig_video_lines;
    - cols = RM_SCREEN_INFO.orig_video_cols;
    + lines = rm_screen_info->orig_video_lines;
    + cols = rm_screen_info->orig_video_cols;

    window = output; /* Output buffer (Normally at 1M) */
    free_mem_ptr = heap; /* Heap */
    --
    1.5.5.1
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2008-05-24 00:03    [W:0.024 / U:0.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site