From c58d9a073ec6dce3f7b4440467c6d93ff162222b Mon Sep 17 00:00:00 2001 From: okuji Date: Fri, 17 Sep 1999 19:15:37 +0000 Subject: [PATCH] add a missing RAW_ADDR into gunzip.c. --- ChangeLog | 8 ++++++++ stage2/gunzip.c | 2 +- stage2/shared.h | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f87991ef..f025686e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +1999-09-18 OKUJI Yoshinori + + * stage2/gunzip.c (reset_linalloc): Use the macro RAW_ADDR + before setting LINALLOC_TOPADDR. + * stage2/shared.h [!GRUB_UTIL] (RAW_ADDR): Added parenthesises + to avoid a gcc warning. + [!GRUB_UTIL] (RAW_SEG): Likewise. + 1999-09-18 OKUJI Yoshinori * acinclude.m4 (grub_CHECK_START_SYMBOL): New function. diff --git a/stage2/gunzip.c b/stage2/gunzip.c index 15fb84540..076e10499 100644 --- a/stage2/gunzip.c +++ b/stage2/gunzip.c @@ -170,7 +170,7 @@ linalloc (int size) static void reset_linalloc (void) { - linalloc_topaddr = (mbi.mem_upper << 10) + 0x100000; + linalloc_topaddr = RAW_ADDR ((mbi.mem_upper << 10) + 0x100000); } diff --git a/stage2/shared.h b/stage2/shared.h index 43dbe896f..d6b6bb352 100644 --- a/stage2/shared.h +++ b/stage2/shared.h @@ -38,8 +38,8 @@ extern char *grub_scratch_mem; # define RAW_ADDR(x) ((x) + (int) grub_scratch_mem) # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4) #else -# define RAW_ADDR(x) x -# define RAW_SEG(x) x +# define RAW_ADDR(x) (x) +# define RAW_SEG(x) (x) #endif /*