From: Heiko Carstens Date: Wed, 3 Aug 2011 14:44:24 +0000 (+0200) Subject: [S390] Add support for IBM zEnterprise 114 X-Git-Tag: v3.1-rc1~34^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a81b171429113ae0af2920f5d4ecfe571230627;p=platform%2Fupstream%2Fkernel-adaptation-pc.git [S390] Add support for IBM zEnterprise 114 Just fix up the Kconfig description and the elf platform. Signed-off-by: Heiko Carstens --- diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index c03fef7..17dbb43 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 18640ff..7b371c3 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; }