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

Commit 48a8ca03 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390/kexec: move machine_crash_shutdown() to machine_kexec.c 



machine_crash_shutdown() was the only function in crash.c.
So move the function and delete one file.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 1c725922

arch/s390/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_cpum_cf.o 
obj-$(CONFIG_64BIT)		+= cache.o



# Kexec part

S390_KEXEC_OBJS := machine_kexec.o crash.o

S390_KEXEC_OBJS := machine_kexec.o

S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)

obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)

arch/s390/kernel/crash.c

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 * Copyright IBM Corp. 2005

 *

 * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>

 *

 */



#include <linux/threads.h>

#include <linux/kexec.h>

#include <linux/reboot.h>



void machine_crash_shutdown(struct pt_regs *regs)

{

}

arch/s390/kernel/machine_kexec.c

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ void machine_shutdown(void) 
{

}



void machine_crash_shutdown(struct pt_regs *regs)

{

}



/*

 * Do normal kexec

 */