diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2005-06-25 14:58:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:24:51 -0700 |
| commit | cf13f0eaffa31bf6a145c53c589654b11c72ddc7 (patch) | |
| tree | 55c11d753422398b060ea9571698285b5fdc603b /arch/s390/kernel/Makefile | |
| parent | fce0d5740322b98b863f9e609f5a9bd4c06703af (diff) | |
| download | linux-cf13f0eaffa31bf6a145c53c589654b11c72ddc7.tar.gz linux-cf13f0eaffa31bf6a145c53c589654b11c72ddc7.tar.bz2 linux-cf13f0eaffa31bf6a145c53c589654b11c72ddc7.zip | |
[PATCH] kexec: s390 support
Add kexec support for s390 architecture.
From: Milton Miller <miltonm@bga.com>
- Fix passing of first argument to relocate_kernel assembly.
- Fix Kconfig description.
- Remove wrong comment and comments that describe obvious things.
- Allow only KEXEC_TYPE_DEFAULT as image type -> dump not supported.
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/s390/kernel/Makefile')
| -rw-r--r-- | arch/s390/kernel/Makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile index b41e0e199a7c..ab1e49d2e518 100644 --- a/arch/s390/kernel/Makefile +++ b/arch/s390/kernel/Makefile @@ -25,6 +25,16 @@ obj-$(CONFIG_ARCH_S390X) += entry64.o reipl64.o obj-$(CONFIG_VIRT_TIMER) += vtime.o +# Kexec part +S390_KEXEC_OBJS := machine_kexec.o crash.o +ifeq ($(CONFIG_ARCH_S390X),y) +S390_KEXEC_OBJS += relocate_kernel64.o +else +S390_KEXEC_OBJS += relocate_kernel.o +endif +obj-$(CONFIG_KEXEC) += $(S390_KEXEC_OBJS) + + # # This is just to get the dependencies... # |