From: Andreas Krebbel Date: Wed, 9 Jan 2013 09:13:55 +0000 (+0100) Subject: oprofile, s390: Add support for IBM zEnterprise EC12 X-Git-Tag: firefly_0821_release~3680^2~656^2~14^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=23995bbee01d75f09f72b1380bd6045a5b02947b;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Robert Richter --- diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c index 584b93674ea4..ffeb17ce7f31 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; } }