diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2010-09-08 10:12:09 -0700 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2010-09-09 17:02:54 +0900 |
| commit | 94311e029ddd339fa5cedd972505f38f5b072820 (patch) | |
| tree | 5a98ba5dabbcdee68c72623a6991711427dd879b /kexec/arch/x86_64 | |
| parent | 6eec65c4bc0779edaec91f25003f37cac3ef0ec3 (diff) | |
x86_64: Use the x86 crashdump
With proper biarch support in crashdump-x86, crashdump-x86_64
is now redudant and we can use crashdump-x86 everywhere. Using
crashdump-x86 everywhere results in a little unnecessary i386
logic on x86_64 but is otherwise harmless. Removing the
unnecessary duplication between i386 and x86_64 should make
the code much easier to maintain going forward.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'kexec/arch/x86_64')
| -rw-r--r-- | kexec/arch/x86_64/Makefile | 4 | ||||
| -rw-r--r-- | kexec/arch/x86_64/kexec-elf-x86_64.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kexec/arch/x86_64/Makefile b/kexec/arch/x86_64/Makefile index c9a708a..916babf 100644 --- a/kexec/arch/x86_64/Makefile +++ b/kexec/arch/x86_64/Makefile @@ -8,11 +8,11 @@ x86_64_KEXEC_SRCS += kexec/arch/i386/kexec-beoboot-x86.c x86_64_KEXEC_SRCS += kexec/arch/i386/kexec-nbi.c x86_64_KEXEC_SRCS += kexec/arch/i386/x86-linux-setup.c x86_64_KEXEC_SRCS += kexec/arch/i386/kexec-x86-common.c -x86_64_KEXEC_SRCS += kexec/arch/x86_64/crashdump-x86_64.c +x86_64_KEXEC_SRCS += kexec/arch/i386/crashdump-x86.c x86_64_KEXEC_SRCS += kexec/arch/x86_64/kexec-x86_64.c x86_64_KEXEC_SRCS += kexec/arch/x86_64/kexec-elf-x86_64.c x86_64_KEXEC_SRCS += kexec/arch/x86_64/kexec-elf-rel-x86_64.c dist += kexec/arch/x86_64/Makefile $(x86_64_KEXEC_SRCS) \ - kexec/arch/x86_64/kexec-x86_64.h kexec/arch/x86_64/crashdump-x86_64.h \ + kexec/arch/x86_64/kexec-x86_64.h \ kexec/arch/x86_64/include/arch/options.h diff --git a/kexec/arch/x86_64/kexec-elf-x86_64.c b/kexec/arch/x86_64/kexec-elf-x86_64.c index a8204bc..09402d9 100644 --- a/kexec/arch/x86_64/kexec-elf-x86_64.c +++ b/kexec/arch/x86_64/kexec-elf-x86_64.c @@ -37,7 +37,7 @@ #include "../../kexec-elf-boot.h" #include "../i386/x86-linux-setup.h" #include "kexec-x86_64.h" -#include "crashdump-x86_64.h" +#include "../i386/crashdump-x86.h" #include <arch/options.h> static const int probe_debug = 0; |