--- v6
+++ v10
@@ -1,205 +1,437 @@
-When apply_relocate_add is called, modules are already loaded at their
-final location in memory so Elf64_Shdr.sh_addr can be used for accessing
-the section contents as well as the base address for relocations.
+Commit 2965faa5e03d ("kexec: split kexec_load syscall from kexec core
+code") introduced CONFIG_KEXEC_CORE so that CONFIG_KEXEC means whether
+the kexec_load system call should be compiled-in and CONFIG_KEXEC_FILE
+means whether the kexec_file_load system call should be compiled-in.
+These options can be set independently from each other.
-This is not the case for kexec's purgatory, because it will only be
-copied to its final location right before being executed. Therefore,
-it needs to be relocated while it is still in a temporary buffer. In
-this case, Elf64_Shdr.sh_addr can't be used to access the sections'
-contents.
-
-This patch allows elf64_apply_relocate_add to be used when the ELF
-binary is not yet at its final location by adding an addr_base argument
-to specify the address at which the section will be loaded, and rela,
-loc_base and syms_base to point to the sections' contents.
+Since until now powerpc only supported kexec_load, CONFIG_KEXEC and
+CONFIG_KEXEC_CORE were synonyms. That is not the case anymore, so we
+need to make a distinction. Almost all places where CONFIG_KEXEC was
+being used should be using CONFIG_KEXEC_CORE instead, since
+kexec_file_load also needs that code compiled in.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
---
- arch/powerpc/include/asm/elf_util.h | 6 ++--
- arch/powerpc/kernel/elf_util_64.c | 63 +++++++++++++++++++++++++------------
- arch/powerpc/kernel/module_64.c | 17 ++++++++--
- 3 files changed, 61 insertions(+), 25 deletions(-)
+ arch/powerpc/Kconfig | 2 +-
+ arch/powerpc/include/asm/debug.h | 2 +-
+ arch/powerpc/include/asm/kexec.h | 6 +++---
+ arch/powerpc/include/asm/machdep.h | 4 ++--
+ arch/powerpc/include/asm/smp.h | 2 +-
+ arch/powerpc/kernel/Makefile | 4 ++--
+ arch/powerpc/kernel/head_64.S | 2 +-
+ arch/powerpc/kernel/misc_32.S | 2 +-
+ arch/powerpc/kernel/misc_64.S | 6 +++---
+ arch/powerpc/kernel/prom.c | 2 +-
+ arch/powerpc/kernel/setup_64.c | 4 ++--
+ arch/powerpc/kernel/smp.c | 6 +++---
+ arch/powerpc/kernel/traps.c | 2 +-
+ arch/powerpc/platforms/85xx/corenet_generic.c | 2 +-
+ arch/powerpc/platforms/85xx/smp.c | 8 ++++----
+ arch/powerpc/platforms/cell/spu_base.c | 2 +-
+ arch/powerpc/platforms/powernv/setup.c | 6 +++---
+ arch/powerpc/platforms/ps3/setup.c | 4 ++--
+ arch/powerpc/platforms/pseries/Makefile | 2 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 ++--
+ 20 files changed, 36 insertions(+), 36 deletions(-)
-diff --git a/arch/powerpc/include/asm/elf_util.h b/arch/powerpc/include/asm/elf_util.h
-index 37372559fe62..a012ba03282d 100644
---- a/arch/powerpc/include/asm/elf_util.h
-+++ b/arch/powerpc/include/asm/elf_util.h
-@@ -64,7 +64,9 @@ static inline unsigned long my_r2(const struct elf_info *elf_info)
- }
-
- int elf64_apply_relocate_add(const struct elf_info *elf_info,
-- const char *strtab, unsigned int symindex,
-- unsigned int relsec, const char *obj_name);
-+ const char *strtab, const Elf64_Rela *rela,
-+ unsigned int num_rela, void *syms_base,
-+ void *loc_base, Elf64_Addr addr_base,
-+ const char *obj_name);
-
- #endif /* _ASM_POWERPC_ELF_UTIL_H */
-diff --git a/arch/powerpc/kernel/elf_util_64.c b/arch/powerpc/kernel/elf_util_64.c
-index decad2c34f38..8e5d400ac9f2 100644
---- a/arch/powerpc/kernel/elf_util_64.c
-+++ b/arch/powerpc/kernel/elf_util_64.c
-@@ -69,33 +69,56 @@ static void squash_toc_save_inst(const char *name, unsigned long addr) { }
- * elf64_apply_relocate_add - apply 64 bit RELA relocations
- * @elf_info: Support information for the ELF binary being relocated.
- * @strtab: String table for the associated symbol table.
-- * @symindex: Section header index for the associated symbol table.
-- * @relsec: Section header index for the relocations to apply.
-+ * @rela: Contents of the section with the relocations to apply.
-+ * @num_rela: Number of relocation entries in the section.
-+ * @syms_base: Contents of the associated symbol table.
-+ * @loc_base: Contents of the section to which relocations apply.
-+ * @addr_base: The address where the section will be loaded in memory.
- * @obj_name: The name of the ELF binary, for information messages.
-+ *
-+ * Applies RELA relocations to an ELF file already at its final location
-+ * in memory (in which case loc_base == addr_base), or still in a temporary
-+ * buffer.
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 65fba4c34cd7..6cb59c6e5ba4 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -489,7 +489,7 @@ config CRASH_DUMP
+
+ config FA_DUMP
+ bool "Firmware-assisted dump"
+- depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC
++ depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC_CORE
+ help
+ A robust mechanism to get reliable kernel crash dump with
+ assistance from firmware. This approach does not use kexec,
+diff --git a/arch/powerpc/include/asm/debug.h b/arch/powerpc/include/asm/debug.h
+index a954e4975049..86308f177f2d 100644
+--- a/arch/powerpc/include/asm/debug.h
++++ b/arch/powerpc/include/asm/debug.h
+@@ -10,7 +10,7 @@ struct pt_regs;
+
+ extern struct dentry *powerpc_debugfs_root;
+
+-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
++#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)
+
+ extern int (*__debugger)(struct pt_regs *regs);
+ extern int (*__debugger_ipi)(struct pt_regs *regs);
+diff --git a/arch/powerpc/include/asm/kexec.h b/arch/powerpc/include/asm/kexec.h
+index a46f5f45570c..eca2f975bf44 100644
+--- a/arch/powerpc/include/asm/kexec.h
++++ b/arch/powerpc/include/asm/kexec.h
+@@ -53,7 +53,7 @@
+
+ typedef void (*crash_shutdown_t)(void);
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+
+ /*
+ * This function is responsible for capturing register states if coming
+@@ -91,7 +91,7 @@ static inline bool kdump_in_progress(void)
+ return crashing_cpu >= 0;
+ }
+
+-#else /* !CONFIG_KEXEC */
++#else /* !CONFIG_KEXEC_CORE */
+ static inline void crash_kexec_secondary(struct pt_regs *regs) { }
+
+ static inline int overlaps_crashkernel(unsigned long start, unsigned long size)
+@@ -116,7 +116,7 @@ static inline bool kdump_in_progress(void)
+ return false;
+ }
+
+-#endif /* CONFIG_KEXEC */
++#endif /* CONFIG_KEXEC_CORE */
+ #endif /* ! __ASSEMBLY__ */
+ #endif /* __KERNEL__ */
+ #endif /* _ASM_POWERPC_KEXEC_H */
+diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
+index e02cbc6a6c70..5011b69107a7 100644
+--- a/arch/powerpc/include/asm/machdep.h
++++ b/arch/powerpc/include/asm/machdep.h
+@@ -183,7 +183,7 @@ struct machdep_calls {
+ */
+ void (*machine_shutdown)(void);
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ void (*kexec_cpu_down)(int crash_shutdown, int secondary);
+
+ /* Called to do what every setup is needed on image and the
+@@ -198,7 +198,7 @@ struct machdep_calls {
+ * no return.
+ */
+ void (*machine_kexec)(struct kimage *image);
+-#endif /* CONFIG_KEXEC */
++#endif /* CONFIG_KEXEC_CORE */
+
+ #ifdef CONFIG_SUSPEND
+ /* These are called to disable and enable, respectively, IRQs when
+diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
+index 0d02c11dc331..32db16d2e7ad 100644
+--- a/arch/powerpc/include/asm/smp.h
++++ b/arch/powerpc/include/asm/smp.h
+@@ -176,7 +176,7 @@ static inline void set_hard_smp_processor_id(int cpu, int phys)
+ #endif /* !CONFIG_SMP */
+ #endif /* !CONFIG_PPC64 */
+
+-#if defined(CONFIG_PPC64) && (defined(CONFIG_SMP) || defined(CONFIG_KEXEC))
++#if defined(CONFIG_PPC64) && (defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE))
+ extern void smp_release_cpus(void);
+ #else
+ static inline void smp_release_cpus(void) { };
+diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
+index 1925341dbb9c..22534a56c914 100644
+--- a/arch/powerpc/kernel/Makefile
++++ b/arch/powerpc/kernel/Makefile
+@@ -107,7 +107,7 @@ 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_AUDIT) += audit.o
+ obj64-$(CONFIG_AUDIT) += compat_audit.o
+@@ -128,7 +128,7 @@ obj64-$(CONFIG_PPC_TRANSACTIONAL_MEM) += tm.o
+ obj-$(CONFIG_PPC64) += $(obj64-y)
+ obj-$(CONFIG_PPC32) += $(obj32-y)
+
+-ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC),)
++ifneq ($(CONFIG_XMON)$(CONFIG_KEXEC_CORE),)
+ obj-y += ppc_save_regs.o
+ endif
+
+diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
+index 04c546e20cc0..d3d482b628a6 100644
+--- a/arch/powerpc/kernel/head_64.S
++++ b/arch/powerpc/kernel/head_64.S
+@@ -153,7 +153,7 @@ __secondary_hold:
+ cmpdi 0,r12,0
+ beq 100b
+
+-#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
++#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE)
+ #ifdef CONFIG_PPC_BOOK3E
+ tovirt(r12,r12)
+ #endif
+diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
+index 93cf7a5846a6..1863324c6a3c 100644
+--- a/arch/powerpc/kernel/misc_32.S
++++ b/arch/powerpc/kernel/misc_32.S
+@@ -614,7 +614,7 @@ _GLOBAL(start_secondary_resume)
+ _GLOBAL(__main)
+ blr
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ /*
+ * Must be relocatable PIC code callable as a C function.
+ */
+diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
+index 4f178671f230..32be2a844947 100644
+--- a/arch/powerpc/kernel/misc_64.S
++++ b/arch/powerpc/kernel/misc_64.S
+@@ -478,7 +478,7 @@ _GLOBAL(kexec_wait)
+ addi r5,r5,kexec_flag-1b
+
+ 99: HMT_LOW
+-#ifdef CONFIG_KEXEC /* use no memory without kexec */
++#ifdef CONFIG_KEXEC_CORE /* use no memory without kexec */
+ lwz r4,0(r5)
+ cmpwi 0,r4,0
+ beq 99b
+@@ -503,7 +503,7 @@ kexec_flag:
+ .long 0
+
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ #ifdef CONFIG_PPC_BOOK3E
+ /*
+ * BOOK3E has no real MMU mode, so we have to setup the initial TLB
+@@ -716,4 +716,4 @@ _GLOBAL(kexec_sequence)
+ mtlr 4
+ li r5,0
+ blr /* image->start(physid, image->start, 0); */
+-#endif /* CONFIG_KEXEC */
++#endif /* CONFIG_KEXEC_CORE */
+diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
+index b0245bed6f54..fa7aea479fba 100644
+--- a/arch/powerpc/kernel/prom.c
++++ b/arch/powerpc/kernel/prom.c
+@@ -427,7 +427,7 @@ static int __init early_init_dt_scan_chosen_ppc(unsigned long node,
+ tce_alloc_end = *lprop;
+ #endif
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ lprop = of_get_flat_dt_prop(node, "linux,crashkernel-base", NULL);
+ if (lprop)
+ crashk_res.start = *lprop;
+diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
+index 7ac8e6eaab5b..c3e129080c31 100644
+--- a/arch/powerpc/kernel/setup_64.c
++++ b/arch/powerpc/kernel/setup_64.c
+@@ -346,7 +346,7 @@ void early_setup_secondary(void)
+
+ #endif /* CONFIG_SMP */
+
+-#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
++#if defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE)
+ static bool use_spinloop(void)
+ {
+ if (!IS_ENABLED(CONFIG_PPC_BOOK3E))
+@@ -391,7 +391,7 @@ void smp_release_cpus(void)
+
+ DBG(" <- smp_release_cpus()\n");
+ }
+-#endif /* CONFIG_SMP || CONFIG_KEXEC */
++#endif /* CONFIG_SMP || CONFIG_KEXEC_CORE */
+
+ /*
+ * Initialize some remaining members of the ppc64_caches and systemcfg
+diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
+index 9c6f3fd58059..893bd7f79be6 100644
+--- a/arch/powerpc/kernel/smp.c
++++ b/arch/powerpc/kernel/smp.c
+@@ -193,7 +193,7 @@ int smp_request_message_ipi(int virq, int msg)
+ if (msg < 0 || msg > PPC_MSG_DEBUGGER_BREAK) {
+ return -EINVAL;
+ }
+-#if !defined(CONFIG_DEBUGGER) && !defined(CONFIG_KEXEC)
++#if !defined(CONFIG_DEBUGGER) && !defined(CONFIG_KEXEC_CORE)
+ if (msg == PPC_MSG_DEBUGGER_BREAK) {
+ return 1;
+ }
+@@ -325,7 +325,7 @@ void tick_broadcast(const struct cpumask *mask)
+ }
+ #endif
+
+-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
++#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)
+ void smp_send_debugger_break(void)
+ {
+ int cpu;
+@@ -340,7 +340,7 @@ void smp_send_debugger_break(void)
+ }
+ #endif
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ void crash_send_ipi(void (*crash_ipi_callback)(struct pt_regs *))
+ {
+ crash_ipi_function_ptr = crash_ipi_callback;
+diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
+index 023a462725b5..d26605d950fe 100644
+--- a/arch/powerpc/kernel/traps.c
++++ b/arch/powerpc/kernel/traps.c
+@@ -65,7 +65,7 @@
+ #include <asm/hmi.h>
+ #include <sysdev/fsl_pci.h>
+
+-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
++#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)
+ int (*__debugger)(struct pt_regs *regs) __read_mostly;
+ int (*__debugger_ipi)(struct pt_regs *regs) __read_mostly;
+ int (*__debugger_bpt)(struct pt_regs *regs) __read_mostly;
+diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c
+index 1179115a4b5c..3803b0addf65 100644
+--- a/arch/powerpc/platforms/85xx/corenet_generic.c
++++ b/arch/powerpc/platforms/85xx/corenet_generic.c
+@@ -220,7 +220,7 @@ define_machine(corenet_generic) {
+ *
+ * Likewise, problems have been seen with kexec when coreint is enabled.
*/
- int elf64_apply_relocate_add(const struct elf_info *elf_info,
-- const char *strtab, unsigned int symindex,
-- unsigned int relsec, const char *obj_name)
-+ const char *strtab, const Elf64_Rela *rela,
-+ unsigned int num_rela, void *syms_base,
-+ void *loc_base, Elf64_Addr addr_base,
-+ const char *obj_name)
- {
- unsigned int i;
-- Elf64_Shdr *sechdrs = elf_info->sechdrs;
-- Elf64_Rela *rela = (void *)sechdrs[relsec].sh_addr;
-- Elf64_Sym *sym;
- unsigned long *location;
-+ unsigned long address;
- unsigned long value;
-+ const char *name;
-+ Elf64_Sym *sym;
-+
-+ for (i = 0; i < num_rela; i++) {
-+ /*
-+ * rels[i].r_offset contains the byte offset from the beginning
-+ * of section to the storage unit affected.
-+ *
-+ * This is the location to update in the temporary buffer where
-+ * the section is currently loaded. The section will finally
-+ * be loaded to a different address later, pointed to by
-+ * addr_base.
-+ */
-+ location = loc_base + rela[i].r_offset;
-+
-+ /* Final address of the location. */
-+ address = addr_base + rela[i].r_offset;
-
-+ /* This is the symbol the relocation is referring to. */
-+ sym = (Elf64_Sym *) syms_base + ELF64_R_SYM(rela[i].r_info);
-
-- for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
-- /* This is where to make the change */
-- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
-- + rela[i].r_offset;
-- /* This is the symbol it is referring to */
-- sym = (Elf64_Sym *)sechdrs[symindex].sh_addr
-- + ELF64_R_SYM(rela[i].r_info);
-+ if (sym->st_name)
-+ name = strtab + sym->st_name;
-+ else
-+ name = "<unnamed symbol>";
-
- pr_debug("RELOC at %p: %li-type as %s (0x%lx) + %li\n",
- location, (long)ELF64_R_TYPE(rela[i].r_info),
-- strtab + sym->st_name, (unsigned long)sym->st_value,
-+ name, (unsigned long)sym->st_value,
- (long)rela[i].r_addend);
-
- /* `Everything is relative'. */
-@@ -187,7 +210,7 @@ int elf64_apply_relocate_add(const struct elf_info *elf_info,
- value += local_entry_offset(sym);
-
- /* Convert value to relative */
-- value -= (unsigned long)location;
-+ value -= address;
- if (value + 0x2000000 > 0x3ffffff || (value & 3) != 0){
- pr_err("%s: REL24 %li out of range!\n",
- obj_name, (long int)value);
-@@ -202,7 +225,7 @@ int elf64_apply_relocate_add(const struct elf_info *elf_info,
-
- case R_PPC64_REL64:
- /* 64 bits relative (used by features fixups) */
-- *location = value - (unsigned long)location;
-+ *location = value - address;
- break;
-
- case R_PPC64_TOCSAVE:
-@@ -218,7 +241,7 @@ int elf64_apply_relocate_add(const struct elf_info *elf_info,
- * Optimize ELFv2 large code model entry point if
- * the TOC is within 2GB range of current location.
- */
-- value = my_r2(elf_info) - (unsigned long)location;
-+ value = my_r2(elf_info) - address;
- if (value + 0x80008000 > 0xffffffff)
- break;
- /*
-@@ -242,7 +265,7 @@ int elf64_apply_relocate_add(const struct elf_info *elf_info,
-
- case R_PPC64_REL16_HA:
- /* Subtract location pointer */
-- value -= (unsigned long)location;
-+ value -= address;
- value = ((value + 0x8000) >> 16);
- *((uint16_t *) location)
- = (*((uint16_t *) location) & ~0xffff)
-@@ -251,7 +274,7 @@ int elf64_apply_relocate_add(const struct elf_info *elf_info,
-
- case R_PPC64_REL16_LO:
- /* Subtract location pointer */
-- value -= (unsigned long)location;
-+ value -= address;
- *((uint16_t *) location)
- = (*((uint16_t *) location) & ~0xffff)
- | (value & 0xffff);
-diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
-index b929560ecd5b..590e2413974f 100644
---- a/arch/powerpc/kernel/module_64.c
-+++ b/arch/powerpc/kernel/module_64.c
-@@ -439,16 +439,26 @@ int restore_r2(u32 *instruction, const char *obj_name)
+-#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC)
++#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_KEXEC_CORE)
+ .get_irq = mpic_get_irq,
+ #else
+ .get_irq = mpic_get_coreint_irq,
+diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
+index fe9f19e5e935..a83a6d26090d 100644
+--- a/arch/powerpc/platforms/85xx/smp.c
++++ b/arch/powerpc/platforms/85xx/smp.c
+@@ -349,13 +349,13 @@ struct smp_ops_t smp_85xx_ops = {
+ .cpu_disable = generic_cpu_disable,
+ .cpu_die = generic_cpu_die,
+ #endif
+-#if defined(CONFIG_KEXEC) && !defined(CONFIG_PPC64)
++#if defined(CONFIG_KEXEC_CORE) && !defined(CONFIG_PPC64)
+ .give_timebase = smp_generic_give_timebase,
+ .take_timebase = smp_generic_take_timebase,
+ #endif
+ };
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ #ifdef CONFIG_PPC32
+ atomic_t kexec_down_cpus = ATOMIC_INIT(0);
+
+@@ -458,7 +458,7 @@ static void mpc85xx_smp_machine_kexec(struct kimage *image)
+
+ default_machine_kexec(image);
+ }
+-#endif /* CONFIG_KEXEC */
++#endif /* CONFIG_KEXEC_CORE */
+
+ static void smp_85xx_basic_setup(int cpu_nr)
+ {
+@@ -512,7 +512,7 @@ void __init mpc85xx_smp_init(void)
+ #endif
+ smp_ops = &smp_85xx_ops;
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ ppc_md.kexec_cpu_down = mpc85xx_smp_kexec_cpu_down;
+ ppc_md.machine_kexec = mpc85xx_smp_machine_kexec;
+ #endif
+diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
+index e84d8fbc2e21..96c2b8a40630 100644
+--- a/arch/powerpc/platforms/cell/spu_base.c
++++ b/arch/powerpc/platforms/cell/spu_base.c
+@@ -676,7 +676,7 @@ static ssize_t spu_stat_show(struct device *dev,
+
+ static DEVICE_ATTR(stat, 0444, spu_stat_show, NULL);
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+
+ struct crash_spu_info {
+ struct spu *spu;
+diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
+index efe8b6bb168b..d50c7d99baaf 100644
+--- a/arch/powerpc/platforms/powernv/setup.c
++++ b/arch/powerpc/platforms/powernv/setup.c
+@@ -174,7 +174,7 @@ static void pnv_shutdown(void)
+ opal_shutdown();
+ }
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ static void pnv_kexec_wait_secondaries_down(void)
+ {
+ int my_cpu, i, notified = -1;
+@@ -245,7 +245,7 @@ static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
+ opal_reinit_cpus(OPAL_REINIT_CPUS_HILE_BE);
+ }
+ }
+-#endif /* CONFIG_KEXEC */
++#endif /* CONFIG_KEXEC_CORE */
+
+ #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+ static unsigned long pnv_memory_block_size(void)
+@@ -311,7 +311,7 @@ define_machine(powernv) {
+ .machine_shutdown = pnv_shutdown,
+ .power_save = NULL,
+ .calibrate_decr = generic_calibrate_decr,
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ .kexec_cpu_down = pnv_kexec_cpu_down,
+ #endif
+ #ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
+diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
+index 3a487e7f4a5e..6244bc849469 100644
+--- a/arch/powerpc/platforms/ps3/setup.c
++++ b/arch/powerpc/platforms/ps3/setup.c
+@@ -250,7 +250,7 @@ static int __init ps3_probe(void)
return 1;
}
-+/*
-+ * When this function is called, the module is already at its final location in
-+ * memory, so Elf64_Shdr.sh_addr can be used for accessing the section
-+ * contents as well as the base address for relocations.
-+ */
- int apply_relocate_add(Elf64_Shdr *sechdrs,
- const char *strtab,
- unsigned int symindex,
- unsigned int relsec,
- struct module *me)
- {
-+ Elf64_Shdr *rel_section = &sechdrs[relsec];
-+ void *syms_base = (void *) sechdrs[symindex].sh_addr;
-+ Elf64_Addr addr_base = sechdrs[rel_section->sh_info].sh_addr;
-+ const Elf64_Rela *rela = (const Elf64_Rela *) rel_section->sh_addr;
-+ unsigned int num_rela = rel_section->sh_size / sizeof(Elf64_Rela);
- Elf64_Sym *sym;
-
- pr_debug("Applying ADD relocate section %u to %u\n", relsec,
-- sechdrs[relsec].sh_info);
-+ rel_section->sh_info);
-
- /* First time we're called, we can fix up .TOC. */
- if (!me->arch.toc_fixed) {
-@@ -460,8 +470,9 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
- me->arch.toc_fixed = true;
- }
-
-- return elf64_apply_relocate_add(&me->arch.elf_info, strtab, symindex,
-- relsec, me->name);
-+ return elf64_apply_relocate_add(&me->arch.elf_info, strtab, rela,
-+ num_rela, syms_base, (void *) addr_base,
-+ addr_base, me->name);
- }
-
- #ifdef CONFIG_DYNAMIC_FTRACE
+-#if defined(CONFIG_KEXEC)
++#if defined(CONFIG_KEXEC_CORE)
+ static void ps3_kexec_cpu_down(int crash_shutdown, int secondary)
+ {
+ int cpu = smp_processor_id();
+@@ -276,7 +276,7 @@ define_machine(ps3) {
+ .progress = ps3_progress,
+ .restart = ps3_restart,
+ .halt = ps3_halt,
+-#if defined(CONFIG_KEXEC)
++#if defined(CONFIG_KEXEC_CORE)
+ .kexec_cpu_down = ps3_kexec_cpu_down,
+ #endif
+ };
+diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
+index fedc2ccf029d..dd9d9c2ba71b 100644
+--- a/arch/powerpc/platforms/pseries/Makefile
++++ b/arch/powerpc/platforms/pseries/Makefile
+@@ -8,7 +8,7 @@ obj-y := lpar.o hvCall.o nvram.o reconfig.o \
+ pci.o pci_dlpar.o eeh_pseries.o msi.o
+ obj-$(CONFIG_SMP) += smp.o
+ obj-$(CONFIG_SCANLOG) += scanlog.o
+-obj-$(CONFIG_KEXEC) += kexec.o
++obj-$(CONFIG_KEXEC_CORE) += kexec.o
+ obj-$(CONFIG_PSERIES_ENERGY) += pseries_energy.o
+
+ obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu.o
+diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
+index 97aa3f332f24..7736352f7279 100644
+--- a/arch/powerpc/platforms/pseries/setup.c
++++ b/arch/powerpc/platforms/pseries/setup.c
+@@ -367,7 +367,7 @@ void pseries_disable_reloc_on_exc(void)
+ }
+ EXPORT_SYMBOL(pseries_disable_reloc_on_exc);
+
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ static void pSeries_machine_kexec(struct kimage *image)
+ {
+ if (firmware_has_feature(FW_FEATURE_SET_MODE))
+@@ -725,7 +725,7 @@ define_machine(pseries) {
+ .progress = rtas_progress,
+ .system_reset_exception = pSeries_system_reset_exception,
+ .machine_check_exception = pSeries_machine_check_exception,
+-#ifdef CONFIG_KEXEC
++#ifdef CONFIG_KEXEC_CORE
+ .machine_kexec = pSeries_machine_kexec,
+ .kexec_cpu_down = pseries_kexec_cpu_down,
+ #endif
--
-1.9.1
+2.7.4