From ed3a3f84285363bbbcbcd2a9049e5e8bbf5672f9 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 3 Aug 2011 16:44:24 +0200 Subject: [PATCH] --- yaml --- r: 262395 b: refs/heads/master c: 3a81b171429113ae0af2920f5d4ecfe571230627 h: refs/heads/master i: 262393: a438bdc1590195e7446427602bc7e4844969f773 262391: 6d05d452221dde3d372667baf382bd3bfe1d554f v: v3 --- [refs] | 2 +- trunk/arch/s390/Kconfig | 8 ++++---- trunk/arch/s390/kernel/setup.c | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 34e4b9fe8241..24f64faab9a7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34cd551a31cd4e35cd3f9ed9f13bb46b4ee98508 +refs/heads/master: 3a81b171429113ae0af2920f5d4ecfe571230627 diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig index c03fef7a9c22..17dbb4318261 100644 --- a/trunk/arch/s390/Kconfig +++ b/trunk/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/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index 18640ff0aa1a..7b371c37061d 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/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; }