Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens 2012-08-27 15:50:29 +02:00 committed by Martin Schwidefsky
parent 1c725922dd
commit 48a8ca03f8
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kernel/Makefile
View File

@ -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)

14
arch/s390/kernel/crash.c
View File

@ -1,14 +0,0 @@
/*
* 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)
{
}

4
arch/s390/kernel/machine_kexec.c
View File

@ -191,6 +191,10 @@ void machine_shutdown(void)
{ {
} }
void machine_crash_shutdown(struct pt_regs *regs)
{
}
/* /*
* Do normal kexec * Do normal kexec
*/ */