Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ed23b3e authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/kexec: remove CONFIG_KEXEC



Since "Kconfig: split the s390 base menu" CONFIG_KEXEC gets always selected.
Therefore there is no point in keeping CONFIG_KEXEC anywhere.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 708c39db
Loading
Loading
Loading
Loading
+2 −6
Original line number Diff line number Diff line
@@ -23,10 +23,11 @@ CFLAGS_sysinfo.o += -Iinclude/math-emu -Iarch/s390/math-emu -w
obj-y	:=  bitmap.o traps.o time.o process.o base.o early.o setup.o vtime.o \
	    processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o \
	    debug.o irq.o ipl.o dis.o diag.o mem_detect.o sclp.o vdso.o \
	    sysinfo.o jump_label.o lgr.o os_info.o
	    sysinfo.o jump_label.o lgr.o os_info.o machine_kexec.o

obj-y	+= $(if $(CONFIG_64BIT),entry64.o,entry.o)
obj-y	+= $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
obj-y	+= $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)

extra-y				+= head.o vmlinux.lds
extra-y				+= $(if $(CONFIG_64BIT),head64.o,head31.o)
@@ -54,11 +55,6 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_cpum_cf.o
obj-y				+= runtime_instr.o cache.o
endif

# Kexec part
S390_KEXEC_OBJS := machine_kexec.o
S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)

# vdso
obj-$(CONFIG_64BIT)		+= vdso64/
obj-$(CONFIG_32BIT)		+= vdso32/
+0 −2
Original line number Diff line number Diff line
@@ -584,9 +584,7 @@ static void __init setup_memory_end(void)

static void __init setup_vmcoreinfo(void)
{
#ifdef CONFIG_KEXEC
	mem_assign_absolute(S390_lowcore.vmcore_info, paddr_vmcoreinfo_note());
#endif
}

#ifdef CONFIG_CRASH_DUMP