warning fixes
This commit is contained in:
parent
be320b471f
commit
4c7f8ce16d
2 changed files with 2 additions and 5 deletions
|
@ -80,7 +80,7 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
|
||||||
for (i = 1; i < 32; i++)
|
for (i = 1; i < 32; i++)
|
||||||
write_reg (i, state.gpr[i], &ptr);
|
write_reg (i, state.gpr[i], &ptr);
|
||||||
write_jump (state.jumpreg, &ptr);
|
write_jump (state.jumpreg, &ptr);
|
||||||
((void (*) ()) ptr0) ();
|
((void (*) (void)) ptr0) ();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -98,7 +98,7 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
|
||||||
for (i = 1; i < 32; i++)
|
for (i = 1; i < 32; i++)
|
||||||
write_reg (i, state.gpr[i], &ptr);
|
write_reg (i, state.gpr[i], &ptr);
|
||||||
write_jump (state.jumpreg, &ptr);
|
write_jump (state.jumpreg, &ptr);
|
||||||
((void (*) ()) ptr0) ();
|
((void (*) (void)) ptr0) ();
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "../relocator.c"
|
#include "../relocator.c"
|
||||||
|
|
|
@ -250,7 +250,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
||||||
{
|
{
|
||||||
grub_file_t file = 0;
|
grub_file_t file = 0;
|
||||||
grub_ssize_t size;
|
grub_ssize_t size;
|
||||||
grub_addr_t addr;
|
|
||||||
|
|
||||||
if (argc == 0)
|
if (argc == 0)
|
||||||
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
|
return grub_error (GRUB_ERR_BAD_ARGUMENT, "no initrd specified");
|
||||||
|
@ -271,8 +270,6 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
||||||
return grub_errno;
|
return grub_errno;
|
||||||
}
|
}
|
||||||
|
|
||||||
grub_dprintf ("loader", "Loading initrd at 0x%x, size 0x%x\n", addr, size);
|
|
||||||
|
|
||||||
if (grub_file_read (file, playground + linux_size, size) != size)
|
if (grub_file_read (file, playground + linux_size, size) != size)
|
||||||
{
|
{
|
||||||
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
grub_error (GRUB_ERR_FILE_READ_ERROR, "Couldn't read file");
|
||||||
|
|
Loading…
Add table
Reference in a new issue