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

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
...@@ -52,7 +52,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_cpum_cf.o ...@@ -52,7 +52,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o perf_cpum_cf.o
obj-$(CONFIG_64BIT) += cache.o obj-$(CONFIG_64BIT) += cache.o
# Kexec part # 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) S390_KEXEC_OBJS += $(if $(CONFIG_64BIT),relocate_kernel64.o,relocate_kernel.o)
obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS) obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS)
......
/*
* 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)
{
}
...@@ -191,6 +191,10 @@ void machine_shutdown(void) ...@@ -191,6 +191,10 @@ void machine_shutdown(void)
{ {
} }
void machine_crash_shutdown(struct pt_regs *regs)
{
}
/* /*
* Do normal kexec * Do normal kexec
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment