[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] i386/relocator: Remove unused avoid_efi_bootservices argumen
From: |
Daniel Kiper |
Subject: |
[PATCH 3/5] i386/relocator: Remove unused avoid_efi_bootservices argument |
Date: |
Fri, 30 Jan 2015 18:59:26 +0100 |
Signed-off-by: Daniel Kiper <address@hidden>
---
grub-core/lib/i386/relocator.c | 5 ++---
grub-core/loader/i386/bsd.c | 6 +++---
grub-core/loader/i386/coreboot/chainloader.c | 2 +-
grub-core/loader/i386/linux.c | 2 +-
grub-core/loader/i386/pc/plan9.c | 2 +-
grub-core/loader/i386/xnu.c | 4 ++--
grub-core/loader/multiboot.c | 4 ----
include/grub/i386/relocator.h | 3 +--
8 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
index 71dd4f0..b879e5b 100644
--- a/grub-core/lib/i386/relocator.c
+++ b/grub-core/lib/i386/relocator.c
@@ -73,8 +73,7 @@ extern struct grub_i386_idt grub_relocator16_idt;
grub_err_t
grub_relocator32_boot (struct grub_relocator *rel,
- struct grub_relocator32_state state,
- int avoid_efi_bootservices)
+ struct grub_relocator32_state state)
{
grub_err_t err;
void *relst;
@@ -87,7 +86,7 @@ grub_relocator32_boot (struct grub_relocator *rel,
0x9a000 - RELOCATOR_SIZEOF (32),
RELOCATOR_SIZEOF (32), 16,
GRUB_RELOCATOR_PREFERENCE_LOW,
- avoid_efi_bootservices);
+ 0);
if (err)
return err;
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
index bc377b3..c2bf09f 100644
--- a/grub-core/loader/i386/bsd.c
+++ b/grub-core/loader/i386/bsd.c
@@ -797,7 +797,7 @@ grub_freebsd_boot (void)
stack[6] = stack_target + 9 * sizeof (grub_uint32_t);
stack[7] = bi.tags;
stack[8] = kern_end;
- return grub_relocator32_boot (relocator, state, 0);
+ return grub_relocator32_boot (relocator, state);
}
/* Not reached. */
@@ -913,7 +913,7 @@ grub_openbsd_boot (void)
stack[7] = (grub_uint8_t *) curarg - (grub_uint8_t *) arg0;
stack[8] = ((grub_uint8_t *) arg0 - (grub_uint8_t *) buf0) + buf_target;
- return grub_relocator32_boot (relocator, state, 0);
+ return grub_relocator32_boot (relocator, state);
}
static grub_err_t
@@ -1228,7 +1228,7 @@ grub_netbsd_boot (void)
stack[5] = grub_mmap_get_upper () >> 10;
stack[6] = grub_mmap_get_lower () >> 10;
- return grub_relocator32_boot (relocator, state, 0);
+ return grub_relocator32_boot (relocator, state);
}
static grub_err_t
diff --git a/grub-core/loader/i386/coreboot/chainloader.c
b/grub-core/loader/i386/coreboot/chainloader.c
index d4cc40b..4bf6dff 100644
--- a/grub-core/loader/i386/coreboot/chainloader.c
+++ b/grub-core/loader/i386/coreboot/chainloader.c
@@ -47,7 +47,7 @@ grub_chain_boot (void)
grub_video_set_mode ("text", 0, 0);
state.eip = entry;
- return grub_relocator32_boot (relocator, state, 0);
+ return grub_relocator32_boot (relocator, state);
}
static grub_err_t
diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
index 291f728..a554da8 100644
--- a/grub-core/loader/i386/linux.c
+++ b/grub-core/loader/i386/linux.c
@@ -661,7 +661,7 @@ grub_linux_boot (void)
state.esi = ctx.real_mode_target;
state.esp = ctx.real_mode_target;
state.eip = ctx.params->code32_start;
- return grub_relocator32_boot (relocator, state, 0);
+ return grub_relocator32_boot (relocator, state);
}
static grub_err_t
diff --git a/grub-core/loader/i386/pc/plan9.c b/grub-core/loader/i386/pc/plan9.c
index 814a49d..bfff497 100644
--- a/grub-core/loader/i386/pc/plan9.c
+++ b/grub-core/loader/i386/pc/plan9.c
@@ -90,7 +90,7 @@ grub_plan9_boot (void)
};
grub_video_set_mode ("text", 0, 0);
- return grub_relocator32_boot (rel, state, 0);
+ return grub_relocator32_boot (rel, state);
}
static grub_err_t
diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
index e0506a6..a2bc876 100644
--- a/grub-core/loader/i386/xnu.c
+++ b/grub-core/loader/i386/xnu.c
@@ -791,7 +791,7 @@ grub_xnu_boot_resume (void)
state.eip = grub_xnu_entry_point;
state.eax = grub_xnu_arg1;
- return grub_relocator32_boot (grub_xnu_relocator, state, 0);
+ return grub_relocator32_boot (grub_xnu_relocator, state);
}
/* Setup video for xnu. */
@@ -1099,7 +1099,7 @@ grub_xnu_boot (void)
grub_outb (0xff, 0x21);
grub_outb (0xff, 0xa1);
- return grub_relocator32_boot (grub_xnu_relocator, state, 0);
+ return grub_relocator32_boot (grub_xnu_relocator, state);
}
static grub_command_t cmd_devprop_load;
diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
index 4b71f33..307da32 100644
--- a/grub-core/loader/multiboot.c
+++ b/grub-core/loader/multiboot.c
@@ -131,11 +131,7 @@ grub_multiboot_boot (void)
if (err)
return err;
-#if defined (__i386__) || defined (__x86_64__)
- grub_relocator32_boot (grub_multiboot_relocator, state, 0);
-#else
grub_relocator32_boot (grub_multiboot_relocator, state);
-#endif
/* Not reached. */
return GRUB_ERR_NONE;
diff --git a/include/grub/i386/relocator.h b/include/grub/i386/relocator.h
index 5f89a7e..08c5fda 100644
--- a/include/grub/i386/relocator.h
+++ b/include/grub/i386/relocator.h
@@ -69,8 +69,7 @@ grub_err_t grub_relocator16_boot (struct grub_relocator *rel,
struct grub_relocator16_state state);
grub_err_t grub_relocator32_boot (struct grub_relocator *rel,
- struct grub_relocator32_state state,
- int avoid_efi_bootservices);
+ struct grub_relocator32_state state);
grub_err_t grub_relocator64_boot (struct grub_relocator *rel,
struct grub_relocator64_state state,
--
1.7.10.4