kexec-tools: x86_64 build fixes
The kexec-tools git tree is currently broken for x86_64.
Signed-off-by: Magnus Damm <[EMAIL PROTECTED]>
---
b/kexec/arch/x86_64/kexec-x86_64.c | 9 +--------
kexec/arch/x86_64/crashdump-x86_64.c | 4 +++-
2 files changed, 4 insertions(+), 9 deletions(-)
index ff1930a..3f3dfcb 100644
--- a/kexec/arch/x86_64/crashdump-x86_64.c
+++ b/kexec/arch/x86_64/crashdump-x86_64.c
@@ -35,6 +35,8 @@ #include "kexec-x86_64.h"
#include "crashdump-x86_64.h"
#include <x86/x86-linux.h>
+extern struct arch_options_t arch_options;
+
/* Forward Declaration. */
static int exclude_crash_reserve_region(int *nr_ranges);
@@ -655,7 +657,7 @@ #define MAX_NOTE_BYTES 1024
bufp += sizeof(Elf32_Phdr);
phdr->p_type = PT_LOAD;
phdr->p_flags = PF_R|PF_W|PF_X;
- if (mstart == BACKUP_START && mend == BACKUP_END)
+ if (mstart == BACKUP_SRC_START && mend == BACKUP_SRC_END)
phdr->p_offset = info->backup_start;
else
phdr->p_offset = mstart;
diff --git a/kexec/arch/x86_64/kexec-x86_64.c b/kexec/arch/x86_64/kexec-x86_64.c
index e11e85a..4bc28cd 100644
--- a/kexec/arch/x86_64/kexec-x86_64.c
+++ b/kexec/arch/x86_64/kexec-x86_64.c
@@ -141,14 +141,7 @@ void arch_usage(void)
);
}
-static struct {
- uint8_t reset_vga;
- uint16_t serial_base;
- uint32_t serial_baud;
- uint8_t console_vga;
- uint8_t console_serial;
- int core_header_type;
-} arch_options = {
+struct arch_options_t arch_options = {
.reset_vga = 0,
.serial_base = 0x3f8,
.serial_baud = 0,
_______________________________________________
fastboot mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/fastboot
