Commit b9b45688 authored by Alexander Gordeev's avatar Alexander Gordeev Committed by Heiko Carstens
Browse files

s390/kexec: make machine_kexec() depend on CONFIG_KEXEC_CORE 



Make machine_kexec.o and relocate_kernel.o depend on
CONFIG_KEXEC_CORE option as other architectures do.

Still generate machine_kexec_reloc.o unconditionally,
since arch_kexec_do_relocs() function is neded by the
decompressor.

Suggested-by: default avatarNathan Chancellor <nathan@kernel.org>
Reported-by: default avatarNathan Chancellor <nathan@kernel.org>
Reported-by: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 1256e70a

arch/s390/kernel/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ CFLAGS_unwind_bc.o += -fno-optimize-sibling-calls 
obj-y	:= head64.o traps.o time.o process.o earlypgm.o early.o setup.o idle.o vtime.o

obj-y	+= processor.o syscall.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o

obj-y	+= debug.o irq.o ipl.o dis.o diag.o vdso.o cpufeature.o

obj-y	+= sysinfo.o lgr.o os_info.o machine_kexec.o

obj-y	+= sysinfo.o lgr.o os_info.o

obj-y	+= runtime_instr.o cache.o fpu.o dumpstack.o guarded_storage.o sthyi.o

obj-y	+= entry.o reipl.o relocate_kernel.o kdebugfs.o alternative.o

obj-y	+= entry.o reipl.o kdebugfs.o alternative.o

obj-y	+= nospec-branch.o ipl_vmparm.o machine_kexec_reloc.o unwind_bc.o

obj-y	+= smp.o text_amode31.o stacktrace.o abs_lowcore.o
@@ -63,6 +63,7 @@ obj-$(CONFIG_RETHOOK) += rethook.o 
obj-$(CONFIG_FUNCTION_TRACER)	+= ftrace.o

obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

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

obj-$(CONFIG_UPROBES)		+= uprobes.o

obj-$(CONFIG_JUMP_LABEL)	+= jump_label.o