summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 13:39:22 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2008-12-25 13:39:14 +0100
commit9fee8db222a344b9ee407fad9c652ed823690788 (patch)
treee8b298b0be2ca71ae7c84759b124c6a4d6be59b3 /arch
parentc58d92b233a41b81fbbea6add4ba1b512784f837 (diff)
downloadblackbird-op-linux-9fee8db222a344b9ee407fad9c652ed823690788.tar.gz
blackbird-op-linux-9fee8db222a344b9ee407fad9c652ed823690788.zip
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/kernel/setup.c5
1 files changed, 5 insertions, 0 deletions
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;
}
}
OpenPOWER on IntegriCloud