diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-09-07 14:11:54 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-09-09 17:02:54 +0900 |
| commit | 6eec65c4bc0779edaec91f25003f37cac3ef0ec3 (patch) | |
| tree | 06bde96a6ca346f80b9211871364298a0ec95310 /kexec | |
| parent | aac5b6fecdc04aeebf7aa8885a8365276b1c5ea8 (diff) | |
x86_64: Use the i386 arch_options_t on x86_64
In preparation for having a single crashdump implementation
on i386 and x86_64 start sharing arch_options_t between
i386 and x86_64, and don't make arch_options static on
x86_64.
i386 and x86_64 have been using identitcal defitions of
arch_options for a while this change now reflects that
practical reality in the code.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec')
| -rw-r--r-- | kexec/arch/x86_64/kexec-x86_64.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/kexec/arch/x86_64/kexec-x86_64.c b/kexec/arch/x86_64/kexec-x86_64.c index a4f2d10..3092643 100644 --- a/kexec/arch/x86_64/kexec-x86_64.c +++ b/kexec/arch/x86_64/kexec-x86_64.c @@ -29,7 +29,7 @@ #include "../../kexec-elf.h" #include "../../kexec-syscall.h" #include "kexec-x86_64.h" -#include "crashdump-x86_64.h" +#include "../i386/crashdump-x86.h" #include <arch/options.h> struct file_type file_type[] = { @@ -55,14 +55,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, |