From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 29 Oct 2010 14:50:35 +0000 (+0200)
Subject: [S390] Add z196 machine type to setup_hwcaps
X-Git-Tag: v2.6.37-rc1~41^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c84b9051d6b97d8c6533a194aedcd484c003d278;p=thirdparty%2Fkernel%2Flinux.git

[S390] Add z196 machine type to setup_hwcaps

Add machine type for zEnterprise 196 to elf platform detection.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index e3ceb911dc758..6f6350826c81c 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -761,6 +761,9 @@ static void __init setup_hwcaps(void)
 	case 0x2098:
 		strcpy(elf_platform, "z10");
 		break;
+	case 0x2817:
+		strcpy(elf_platform, "z196");
+		break;
 	}
 }