Am Samstag, 15. Oktober 2016, 23:14:20 BRST schrieb kbuild test robot:
> arch/powerpc/kernel/built-in.o: In function `apply_relocate_add':
> >> arch/powerpc/kernel/module_64.c:463: undefined reference to
> >> `.elf64_apply_relocate_add'
This is because my kexec_file_load patches lost a few hunks.
The patch below fixes the issue.
Many of the problems with this patch series stem from the fact that it
conflicted with the s/CONFIG_WORD_SIZE/BITS/ change that went into v4.9-rc1.
I will post a new version rebased on top of v4.9-rc1, this should get things
back on track. I'll have them ready by tomorrow.
Thank you for your patience.
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 3bf8dc6ccf7d..6ff8927a8a05 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -108,8 +108,14 @@ pci64-$(CONFIG_PPC64) += pci_dn.o pci-hotplug.o isa-bridge.o
obj-$(CONFIG_PCI) += pci_$(BITS).o $(pci64-y) \
pci-common.o pci_of_scan.o
obj-$(CONFIG_PCI_MSI) += msi.o
-obj-$(CONFIG_KEXEC) += machine_kexec.o crash.o \
+obj-$(CONFIG_KEXEC_CORE) += machine_kexec.o crash.o \
machine_kexec_$(BITS).o
+obj-$(CONFIG_KEXEC_FILE) += kexec_elf_$(BITS).o
+
+ifeq ($(CONFIG_HAVE_IMA_KEXEC)$(CONFIG_IMA),yy)
+obj-y += ima_kexec.o
+endif
+
obj-$(CONFIG_AUDIT) += audit.o
obj64-$(CONFIG_AUDIT) += compat_audit.o
@@ -125,7 +131,7 @@ obj-y += iomap.o
endif
ifneq ($(CONFIG_MODULES)$(CONFIG_KEXEC_FILE),)
-ifeq ($(CONFIG_WORD_SIZE),64)
+ifeq ($(BITS),64)
obj-y += elf_util.o elf_util_64.o
endif
endif
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index 8dbaf636c95e..86322f765b58 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -33,6 +33,16 @@
#include <asm/smp.h>
#include <asm/hw_breakpoint.h>
#include <asm/asm-prototypes.h>
+#include <asm/kexec_elf_64.h>
+#include <asm/ima.h>
+
+#define SLAVE_CODE_SIZE 256
+
+#ifdef CONFIG_KEXEC_FILE
+static struct kexec_file_ops *kexec_file_loaders[] = {
+ &kexec_elf64_ops,
+};
+#endif
int default_machine_kexec_prepare(struct kimage *image)
{
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>