2009-05-04 Pavel Roskin <proski@gnu.org>
* commands/acpi.c: Remove unused variable my_mod. * partmap/amiga.c: Likewise. * partmap/apple.c: Likewise. * partmap/gpt.c: Likewise. * partmap/pc.c: Likewise. * partmap/sun.c: Likewise. * term/gfxterm.c: Likewise. * term/i386/pc/vesafb.c: Likewise. * term/i386/pc/vga.c: Likewise.
This commit is contained in:
parent
67e23c9004
commit
de5fd76e95
10 changed files with 12 additions and 45 deletions
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,15 @@
|
||||||
|
2009-05-04 Pavel Roskin <proski@gnu.org>
|
||||||
|
|
||||||
|
* commands/acpi.c: Remove unused variable my_mod.
|
||||||
|
* partmap/amiga.c: Likewise.
|
||||||
|
* partmap/apple.c: Likewise.
|
||||||
|
* partmap/gpt.c: Likewise.
|
||||||
|
* partmap/pc.c: Likewise.
|
||||||
|
* partmap/sun.c: Likewise.
|
||||||
|
* term/gfxterm.c: Likewise.
|
||||||
|
* term/i386/pc/vesafb.c: Likewise.
|
||||||
|
* term/i386/pc/vga.c: Likewise.
|
||||||
|
|
||||||
2009-05-04 David S. Miller <davem@davemloft.net>
|
2009-05-04 David S. Miller <davem@davemloft.net>
|
||||||
|
|
||||||
* kern/ieee1275/openfw.c (grub_children_iterate): Fix string
|
* kern/ieee1275/openfw.c (grub_children_iterate): Fix string
|
||||||
|
|
|
@ -73,7 +73,6 @@ grub_byte_checksum (void *base, grub_size_t size)
|
||||||
/* rev1 is 1 if ACPIv1 is to be generated, 0 otherwise.
|
/* rev1 is 1 if ACPIv1 is to be generated, 0 otherwise.
|
||||||
rev2 contains the revision of ACPIv2+ to generate or 0 if none. */
|
rev2 contains the revision of ACPIv2+ to generate or 0 if none. */
|
||||||
static int rev1, rev2;
|
static int rev1, rev2;
|
||||||
static grub_dl_t my_mod;
|
|
||||||
/* OEMID of RSDP, RSDT and XSDT. */
|
/* OEMID of RSDP, RSDT and XSDT. */
|
||||||
static char root_oemid[6];
|
static char root_oemid[6];
|
||||||
/* OEMTABLE of the same tables. */
|
/* OEMTABLE of the same tables. */
|
||||||
|
@ -764,7 +763,6 @@ GRUB_MOD_INIT(acpi)
|
||||||
"Load host acpi tables and tables "
|
"Load host acpi tables and tables "
|
||||||
"specified by arguments",
|
"specified by arguments",
|
||||||
options);
|
options);
|
||||||
my_mod=mod;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GRUB_MOD_FINI(acpi)
|
GRUB_MOD_FINI(acpi)
|
||||||
|
|
|
@ -67,10 +67,6 @@ struct grub_amiga_partition
|
||||||
|
|
||||||
static struct grub_partition_map grub_amiga_partition_map;
|
static struct grub_partition_map grub_amiga_partition_map;
|
||||||
|
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
|
@ -211,9 +207,6 @@ static struct grub_partition_map grub_amiga_partition_map =
|
||||||
GRUB_MOD_INIT(amiga_partition_map)
|
GRUB_MOD_INIT(amiga_partition_map)
|
||||||
{
|
{
|
||||||
grub_partition_map_register (&grub_amiga_partition_map);
|
grub_partition_map_register (&grub_amiga_partition_map);
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
my_mod = mod;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GRUB_MOD_FINI(amiga_partition_map)
|
GRUB_MOD_FINI(amiga_partition_map)
|
||||||
|
|
|
@ -94,10 +94,6 @@ struct grub_apple_part
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct grub_partition_map grub_apple_partition_map;
|
static struct grub_partition_map grub_apple_partition_map;
|
||||||
|
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
|
@ -247,9 +243,6 @@ static struct grub_partition_map grub_apple_partition_map =
|
||||||
GRUB_MOD_INIT(apple_partition_map)
|
GRUB_MOD_INIT(apple_partition_map)
|
||||||
{
|
{
|
||||||
grub_partition_map_register (&grub_apple_partition_map);
|
grub_partition_map_register (&grub_apple_partition_map);
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
my_mod = mod;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GRUB_MOD_FINI(apple_partition_map)
|
GRUB_MOD_FINI(apple_partition_map)
|
||||||
|
|
|
@ -34,10 +34,6 @@ static const grub_gpt_part_type_t grub_gpt_partition_type_empty = GRUB_GPT_PARTI
|
||||||
|
|
||||||
static struct grub_partition_map grub_gpt_partition_map;
|
static struct grub_partition_map grub_gpt_partition_map;
|
||||||
|
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static grub_err_t
|
static grub_err_t
|
||||||
|
@ -189,9 +185,6 @@ static struct grub_partition_map grub_gpt_partition_map =
|
||||||
GRUB_MOD_INIT(gpt_partition_map)
|
GRUB_MOD_INIT(gpt_partition_map)
|
||||||
{
|
{
|
||||||
grub_partition_map_register (&grub_gpt_partition_map);
|
grub_partition_map_register (&grub_gpt_partition_map);
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
my_mod = mod;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GRUB_MOD_FINI(gpt_partition_map)
|
GRUB_MOD_FINI(gpt_partition_map)
|
||||||
|
|
|
@ -25,10 +25,6 @@
|
||||||
#include <grub/dl.h>
|
#include <grub/dl.h>
|
||||||
|
|
||||||
static struct grub_partition_map grub_pc_partition_map;
|
static struct grub_partition_map grub_pc_partition_map;
|
||||||
|
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* Parse the partition representation in STR and return a partition. */
|
/* Parse the partition representation in STR and return a partition. */
|
||||||
|
@ -312,9 +308,6 @@ static struct grub_partition_map grub_pc_partition_map =
|
||||||
GRUB_MOD_INIT(pc_partition_map)
|
GRUB_MOD_INIT(pc_partition_map)
|
||||||
{
|
{
|
||||||
grub_partition_map_register (&grub_pc_partition_map);
|
grub_partition_map_register (&grub_pc_partition_map);
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
my_mod = mod;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GRUB_MOD_FINI(pc_partition_map)
|
GRUB_MOD_FINI(pc_partition_map)
|
||||||
|
|
|
@ -67,10 +67,6 @@ struct grub_sun_block
|
||||||
|
|
||||||
static struct grub_partition_map grub_sun_partition_map;
|
static struct grub_partition_map grub_sun_partition_map;
|
||||||
|
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Verify checksum (true=ok). */
|
/* Verify checksum (true=ok). */
|
||||||
static int
|
static int
|
||||||
grub_sun_is_valid (struct grub_sun_block *label)
|
grub_sun_is_valid (struct grub_sun_block *label)
|
||||||
|
@ -211,9 +207,6 @@ static struct grub_partition_map grub_sun_partition_map =
|
||||||
GRUB_MOD_INIT(sun_partition_map)
|
GRUB_MOD_INIT(sun_partition_map)
|
||||||
{
|
{
|
||||||
grub_partition_map_register (&grub_sun_partition_map);
|
grub_partition_map_register (&grub_sun_partition_map);
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
my_mod = mod;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GRUB_MOD_FINI(sun_partition_map)
|
GRUB_MOD_FINI(sun_partition_map)
|
||||||
|
|
|
@ -106,7 +106,6 @@ struct grub_virtual_screen
|
||||||
|
|
||||||
static struct grub_virtual_screen virtual_screen;
|
static struct grub_virtual_screen virtual_screen;
|
||||||
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
static struct grub_video_mode_info mode_info;
|
static struct grub_video_mode_info mode_info;
|
||||||
|
|
||||||
static struct grub_video_render_target *text_layer;
|
static struct grub_video_render_target *text_layer;
|
||||||
|
@ -1154,7 +1153,6 @@ static grub_command_t cmd;
|
||||||
|
|
||||||
GRUB_MOD_INIT(term_gfxterm)
|
GRUB_MOD_INIT(term_gfxterm)
|
||||||
{
|
{
|
||||||
my_mod = mod;
|
|
||||||
grub_term_register_output ("gfxterm", &grub_video_term);
|
grub_term_register_output ("gfxterm", &grub_video_term);
|
||||||
cmd = grub_register_command ("background_image",
|
cmd = grub_register_command ("background_image",
|
||||||
grub_gfxterm_background_image_cmd,
|
grub_gfxterm_background_image_cmd,
|
||||||
|
|
|
@ -89,7 +89,6 @@ static struct grub_virtual_screen virtual_screen =
|
||||||
.text_buffer = 0
|
.text_buffer = 0
|
||||||
};
|
};
|
||||||
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
static unsigned char *vga_font = 0;
|
static unsigned char *vga_font = 0;
|
||||||
static grub_uint32_t old_mode = 0;
|
static grub_uint32_t old_mode = 0;
|
||||||
|
|
||||||
|
@ -598,7 +597,6 @@ static struct grub_term_output grub_vesafb_term =
|
||||||
|
|
||||||
GRUB_MOD_INIT(vesafb)
|
GRUB_MOD_INIT(vesafb)
|
||||||
{
|
{
|
||||||
my_mod = mod;
|
|
||||||
grub_term_register_output ("vesafb", &grub_vesafb_term);
|
grub_term_register_output ("vesafb", &grub_vesafb_term);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,6 @@ struct colored_char
|
||||||
unsigned char index;
|
unsigned char index;
|
||||||
};
|
};
|
||||||
|
|
||||||
static grub_dl_t my_mod;
|
|
||||||
static unsigned char text_mode;
|
static unsigned char text_mode;
|
||||||
static unsigned xpos, ypos;
|
static unsigned xpos, ypos;
|
||||||
static int cursor_state;
|
static int cursor_state;
|
||||||
|
@ -505,9 +504,6 @@ static struct grub_term_output grub_vga_term =
|
||||||
|
|
||||||
GRUB_MOD_INIT(vga)
|
GRUB_MOD_INIT(vga)
|
||||||
{
|
{
|
||||||
#ifndef GRUB_UTIL
|
|
||||||
my_mod = mod;
|
|
||||||
#endif
|
|
||||||
grub_term_register_output ("vga", &grub_vga_term);
|
grub_term_register_output ("vga", &grub_vga_term);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue