vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add a missing RAW_ADDR into gunzip.c.

Browse source
This commit is contained in:
okuji 1999-09-17 19:15:37 +00:00
parent 84bf7c7d5d
commit c58d9a073e
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
1999-09-18 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* 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 <okuji@kuicr.kyoto-u.ac.jp> 1999-09-18 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* acinclude.m4 (grub_CHECK_START_SYMBOL): New function. * acinclude.m4 (grub_CHECK_START_SYMBOL): New function.

2
stage2/gunzip.c
View file

@ -170,7 +170,7 @@ linalloc (int size)
static void static void
reset_linalloc (void) reset_linalloc (void)
{ {
linalloc_topaddr = (mbi.mem_upper << 10) + 0x100000; linalloc_topaddr = RAW_ADDR ((mbi.mem_upper << 10) + 0x100000);
} }

4
stage2/shared.h
View file

@ -38,8 +38,8 @@ extern char *grub_scratch_mem;
# define RAW_ADDR(x) ((x) + (int) grub_scratch_mem) # define RAW_ADDR(x) ((x) + (int) grub_scratch_mem)
# define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4) # define RAW_SEG(x) (RAW_ADDR ((x) << 4) >> 4)
#else #else
# define RAW_ADDR(x) x # define RAW_ADDR(x) (x)
# define RAW_SEG(x) x # define RAW_SEG(x) (x)
#endif #endif
/* /*