From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu, 25 Dec 2008 12:39:22 +0000 (+0100)
Subject: [S390] add new machine types to setup_hwcaps.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9fee8db222a344b9ee407fad9c652ed823690788;p=deliverable%2Flinux.git

[S390] add new machine types to setup_hwcaps.

Add the machine types for z9-bc, z10-ec and z10-bc to the elf_platform
detection in setup_hwcaps.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index a0d44bc0c389..323dedecdf54 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -722,8 +722,13 @@ static void __init setup_hwcaps(void)
 		strcpy(elf_platform, "z990");
 		break;
 	case 0x2094:
+	case 0x2096:
 		strcpy(elf_platform, "z9-109");
 		break;
+	case 0x2097:
+	case 0x2098:
+		strcpy(elf_platform, "z10");
+		break;
 	}
 }