diff options
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | kexec/arch/x86_64/Makefile | 4 | ||||
| -rw-r--r-- | kexec/arch/x86_64/kexec-elf-x86_64.c | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 4d193b1..ba2e638 100644 --- a/Makefile.in +++ b/Makefile.in @@ -158,6 +158,10 @@ include $(srcdir)/kexec/Makefile # include $(srcdir)/kdump/Makefile +# vmcore-dmesg (read dmesg from a vmcore) +# +include $(srcdir)/vmcore-dmesg/Makefile + # # kexec_test (test program) # @@ -171,10 +175,10 @@ SRCS:= $(dist) PSRCS:=$(foreach s, $(SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) PGSRCS:=$(foreach s, $(GENERATED_SRCS), $(PACKAGE_NAME)-$(PACKAGE_VERSION)/$(s)) -MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) +MAN_PAGES:=$(KEXEC_MANPAGE) $(KDUMP_MANPAGE) $(VMCORE_DMESG_MANPAGE) BINARIES_i386:=$(KEXEC_TEST) $(KEXEC_TEST) BINARIES_x86_64:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH)) -BINARIES:=$(KEXEC) $(KDUMP) $(BINARIES_$(ARCH)) +BINARIES:=$(KEXEC) $(KDUMP) $(VMCORE_DMESG) $(BINARIES_$(ARCH)) TARGETS:=$(BINARIES) $(MAN_PAGES) 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; |