Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Tesarik <ptesarik@suse.cz>2019-07-20 00:00:17 +0200
committerPetr Tesarik <ptesarik@suse.cz>2019-07-20 00:00:17 +0200
commit8139b271a3ec8424b2ff4da6a01baeeb0018091a (patch)
treee086393932b16d4e4b6f35346bfeca62246c1a69
parentb89c6928e80840d07fbdf44910e366f1adf7aeff (diff)
s390/cpumf: Add extended counter set definitions for model
8561 and 8562 (bsc#1142052 LTC#179320).
-rw-r--r--patches.suse/s390-cpumf-add-extended-counter-set-definitions-for-model-8561-and-856230
-rw-r--r--series.conf1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches.suse/s390-cpumf-add-extended-counter-set-definitions-for-model-8561-and-8562 b/patches.suse/s390-cpumf-add-extended-counter-set-definitions-for-model-8561-and-8562
new file mode 100644
index 0000000000..5a6abba04d
--- /dev/null
+++ b/patches.suse/s390-cpumf-add-extended-counter-set-definitions-for-model-8561-and-8562
@@ -0,0 +1,30 @@
+From: Thomas Richter <tmricht@linux.ibm.com>
+Date: Fri, 12 Apr 2019 11:32:28 +0200
+Subject: s390/cpumf: Add extended counter set definitions for model 8561 and
+ 8562
+Git-commit: 820bace734722715c643dcb5f74b502cb912d4eb
+Patch-mainline: v5.2-rc1
+References: bsc#1142052 LTC#179320
+
+Add the extended counter set definitions for s390 machine types
+8561 and 8262. They are identical with machine types 3906 and
+3907.
+
+Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
+Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
+Acked-by: Petr Tesarik <ptesarik@suse.com>
+---
+ arch/s390/kernel/perf_cpum_cf_events.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/s390/kernel/perf_cpum_cf_events.c
++++ b/arch/s390/kernel/perf_cpum_cf_events.c
+@@ -623,6 +623,8 @@ __init const struct attribute_group **cp
+ break;
+ case 0x3906:
+ case 0x3907:
++ case 0x8561:
++ case 0x8562:
+ model = cpumcf_z14_pmu_event_attr;
+ break;
+ default:
diff --git a/series.conf b/series.conf
index 6dd38a3ecd..642262392d 100644
--- a/series.conf
+++ b/series.conf
@@ -47887,6 +47887,7 @@
patches.fixes/0002-ocfs2-add-locking-filter-debugfs-file.patch
patches.fixes/0003-ocfs2-add-first-lock-wait-time-in-locking_state.patch
patches.arch/kvm-svm-avic-do-not-send-avic-doorbell-to-self
+ patches.suse/s390-cpumf-add-extended-counter-set-definitions-for-model-8561-and-8562
patches.arch/powerpc-watchpoint-Restore-NV-GPRs-while-returning-f.patch
patches.arch/powerpc-mm-drconf-Use-NUMA_NO_NODE-on-failures-inste.patch
patches.arch/powerpc-mm-Fix-node-look-up-with-numa-off-boot.patch