summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndreas Krebbel <krebbel@linux.vnet.ibm.com>2013-01-09 09:13:55 (GMT)
committerRobert Richter <rric@kernel.org>2013-04-06 13:25:42 (GMT)
commit23995bbee01d75f09f72b1380bd6045a5b02947b (patch)
tree866ba43d084b9e5fe63c62a7ff5d9499395c9cd8 /arch
parent07961ac7c0ee8b546658717034fe692fd12eefa9 (diff)
downloadlinux-fsl-qoriq-23995bbee01d75f09f72b1380bd6045a5b02947b.tar.xz
oprofile, s390: Add support for IBM zEnterprise EC12
This patch adds support for the latest release of the IBM mainframe series - the IBM zEnterprise EC12 (zEC12). The CPU measurement facility didn't change. So only the new CPU type has to be tolerated. Signed-off-by: Andreas Krebbel <krebbel@linux.vnet.ibm.com> Signed-off-by: Robert Richter <rric@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/oprofile/init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 584b936..ffeb17c 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -440,6 +440,7 @@ static int oprofile_hwsampler_init(struct oprofile_operations *ops)
switch (id.machine) {
case 0x2097: case 0x2098: ops->cpu_type = "s390/z10"; break;
case 0x2817: case 0x2818: ops->cpu_type = "s390/z196"; break;
+ case 0x2827: ops->cpu_type = "s390/zEC12"; break;
default: return -ENODEV;
}
}