diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2012-08-27 15:50:29 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-09-26 15:44:54 +0200 |
| commit | 48a8ca03f8fd49a4d0c0c8843d4f5a7008dc2656 (patch) | |
| tree | f37ca12eb5023298aa045b19d019310b611c9215 | |
| parent | 1c725922dd8274b6e0b370ad33cfaef9013fd70b (diff) | |
| download | blackbird-op-linux-48a8ca03f8fd49a4d0c0c8843d4f5a7008dc2656.tar.gz blackbird-op-linux-48a8ca03f8fd49a4d0c0c8843d4f5a7008dc2656.zip | |
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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | arch/s390/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/crash.c | 14 | ||||
| -rw-r--r-- | arch/s390/kernel/machine_kexec.c | 4 |
3 files changed, 5 insertions, 15 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index 86b8247134c1..9a111b621f4e 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -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) diff --git a/arch/s390/kernel/crash.c b/arch/s390/kernel/crash.c deleted file mode 100644 index 3819153de8bd..000000000000 --- a/arch/s390/kernel/crash.c +++ /dev/null @@ -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) -{ -} diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index 493304bdf1c7..0d5063e0ff79 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c @@ -191,6 +191,10 @@ void machine_shutdown(void) { } +void machine_crash_shutdown(struct pt_regs *regs) +{ +} + /* * Do normal kexec */ |
