2008-03-30 Pavel Roskin <proski@gnu.org>

	* 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.

diff --git a/ChangeLog b/ChangeLog
index b6753c10c91eef3ee47f6ae00f76995b38f11ac8..b96141de839d6be2a5fe5b2d6f38337dae3a093f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-03-30  Pavel Roskin  <proski@gnu.org>
 
+       * 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 62cf7f43bb6b4b4ee2b8f624f5976d0ea4c3a96f..87873d202e4a2793a7160b08ecba7657c01d20cf 100644 (file)
--- 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 793c11df71969c41c2726577c8d1dc70fb68d7e7..93f0da91f2becbd7e2779e7ecd2565d9d72281f5 100644 (file)
--- a/disk/i386/pc/biosdisk.c
+++ b/disk/i386/pc/biosdisk.c
@@ -27,7 +27,7 @@
 #include <grub/err.h>
 #include <grub/term.h>
 
-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 f88c69478da1376041ca53de35c26316b4bcbb9e..00296c9c68cc768586fb57f57968b8ec83321e69 100644 (file)
--- 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
 {