Commit fc0fbad1 authored by Andrew Morton's avatar Andrew Morton
Browse files

merge mm-hotfixes-stable into mm-nonmm-stable to pick up depended-upon changes

parents e52ec6a2 4376807b

arch/loongarch/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o 


obj-$(CONFIG_RELOCATABLE)	+= relocate.o



obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o



obj-$(CONFIG_UNWINDER_GUESS)	+= unwind_guess.o

arch/m68k/include/asm/kexec.h

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#ifndef _ASM_M68K_KEXEC_H

#define _ASM_M68K_KEXEC_H



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE



/* Maximum physical address we can use pages from */

#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
@@ -25,6 +25,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 


#endif /* __ASSEMBLY__ */



#endif /* CONFIG_KEXEC */

#endif /* CONFIG_KEXEC_CORE */



#endif /* _ASM_M68K_KEXEC_H */

arch/m68k/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ obj-$(CONFIG_PCI) += pcibios.o 


obj-$(CONFIG_M68K_NONCOHERENT_DMA) += dma.o



obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_BOOTINFO_PROC)	+= bootinfo_proc.o

obj-$(CONFIG_UBOOT)		+= uboot.o

arch/mips/cavium-octeon/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static const struct plat_smp_ops octeon_smp_ops = { 
	.cpu_disable		= octeon_cpu_disable,

	.cpu_die		= octeon_cpu_die,

#endif

#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	.kexec_nonboot_cpu	= kexec_nonboot_cpu_jump,

#endif

};
@@ -502,7 +502,7 @@ static const struct plat_smp_ops octeon_78xx_smp_ops = { 
	.cpu_disable		= octeon_cpu_disable,

	.cpu_die		= octeon_cpu_die,

#endif

#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	.kexec_nonboot_cpu	= kexec_nonboot_cpu_jump,

#endif

};

arch/mips/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
		prepare_frametrace(newregs);

}



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

struct kimage;

extern unsigned long kexec_args[4];

extern int (*_machine_kexec_prepare)(struct kimage *);