summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2011-08-03 16:44:24 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2011-08-03 16:44:20 +0200
commit3a81b171429113ae0af2920f5d4ecfe571230627 (patch)
treeb98d7077bd741b0051d378b315c4d2348b07e822 /arch
parent34cd551a31cd4e35cd3f9ed9f13bb46b4ee98508 (diff)
downloadlinux-3.10-3a81b171429113ae0af2920f5d4ecfe571230627.tar.gz
linux-3.10-3a81b171429113ae0af2920f5d4ecfe571230627.tar.bz2
linux-3.10-3a81b171429113ae0af2920f5d4ecfe571230627.zip
[S390] Add support for IBM zEnterprise 114
Just fix up the Kconfig description and the elf platform. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/Kconfig8
-rw-r--r--arch/s390/kernel/setup.c1
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index c03fef7a9c2..17dbb431826 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -273,11 +273,11 @@ config MARCH_Z10
on older machines.
config MARCH_Z196
- bool "IBM zEnterprise 196"
+ bool "IBM zEnterprise 114 and 196"
help
- Select this to enable optimizations for IBM zEnterprise 196
- (2817 series). The kernel will be slightly faster but will not work
- on older machines.
+ Select this to enable optimizations for IBM zEnterprise 114 and 196
+ (2818 and 2817 series). The kernel will be slightly faster but will
+ not work on older machines.
endchoice
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 18640ff0aa1..7b371c37061 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -752,6 +752,7 @@ static void __init setup_hwcaps(void)
strcpy(elf_platform, "z10");
break;
case 0x2817:
+ case 0x2818:
strcpy(elf_platform, "z196");
break;
}