From b2e999d8508f01de445d8838a5bdb7b9826b7453 Mon Sep 17 00:00:00 2001 From: proski Date: Sun, 30 Mar 2008 05:05:01 +0000 Subject: [PATCH] 2008-03-30 Pavel Roskin * commands/i386/cpuid.c (has_longmode): Make static. * disk/i386/pc/biosdisk.c (cd_drive): Likewise. * include/grub/i386/bsd.h (bios_memmap_t): Remove, it's unused. git-svn-id: svn+ssh://svn.savannah.gnu.org/grub/trunk/grub2@1530 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 4 ++++ commands/i386/cpuid.c | 2 +- disk/i386/pc/biosdisk.c | 2 +- include/grub/i386/bsd.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b6753c10..b96141de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-03-30 Pavel Roskin + * commands/i386/cpuid.c (has_longmode): Make static. + * disk/i386/pc/biosdisk.c (cd_drive): Likewise. + * include/grub/i386/bsd.h (bios_memmap_t): Remove, it's unused. + * kern/i386/pc/startup.S (real_to_prot): Use %cs prefix to load GDT. This is more robust, as %ds can change. (grub_biosdisk_rw_int13_extensions): Don't clear %ds before diff --git a/commands/i386/cpuid.c b/commands/i386/cpuid.c index 62cf7f43..87873d20 100644 --- a/commands/i386/cpuid.c +++ b/commands/i386/cpuid.c @@ -32,7 +32,7 @@ #define bit_LM (1 << 29) -unsigned char has_longmode = 0; +static unsigned char has_longmode = 0; static const struct grub_arg_option options[] = { diff --git a/disk/i386/pc/biosdisk.c b/disk/i386/pc/biosdisk.c index 793c11df..93f0da91 100644 --- a/disk/i386/pc/biosdisk.c +++ b/disk/i386/pc/biosdisk.c @@ -27,7 +27,7 @@ #include #include -int cd_drive = 0; +static int cd_drive = 0; static int grub_biosdisk_get_drive (const char *name) diff --git a/include/grub/i386/bsd.h b/include/grub/i386/bsd.h index f88c6947..00296c9c 100644 --- a/include/grub/i386/bsd.h +++ b/include/grub/i386/bsd.h @@ -149,7 +149,7 @@ struct grub_openbsd_bios_mmap grub_uint64_t addr; grub_uint64_t len; grub_uint32_t type; -} bios_memmap_t; +}; struct grub_openbsd_bootargs { -- 2.11.4.GIT