From 21253069cf703fd3f99d73739a95da0f40981e2a Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 27 Aug 2019 23:02:35 -0400 Subject: [PATCH] fixes for 4.14 Signed-off-by: Sasha Levin --- ...-6-fix-missing-kvm-module-load-for-s.patch | 65 +++++++++++++++++++ queue-4.14/series | 1 + 2 files changed, 66 insertions(+) create mode 100644 queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch diff --git a/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch b/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch new file mode 100644 index 00000000000..6e883f0050a --- /dev/null +++ b/queue-4.14/revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch @@ -0,0 +1,65 @@ +From 7121177986ceb4cd78330b88138ad3befca6120b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 27 Aug 2019 22:58:51 -0400 +Subject: Revert "perf test 6: Fix missing kvm module load for s390" + +This reverts commit 0e8529143a212a2f93fd5dfa63f83275f7c44655. + +Which was upstream commit 53fe307dfd309e425b171f6272d64296a54f4dff. + +Ben Hutchings reports that this commit depends on new code added in +v4.18, and so is irrelevant on older kernels, and breaks the build. + +Signed-off-by: Sasha Levin +--- + tools/perf/tests/parse-events.c | 27 --------------------------- + 1 file changed, 27 deletions(-) + +diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c +index 424b82a7d0782..f0679613bd187 100644 +--- a/tools/perf/tests/parse-events.c ++++ b/tools/perf/tests/parse-events.c +@@ -19,32 +19,6 @@ + #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ + PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) + +-#if defined(__s390x__) +-/* Return true if kvm module is available and loaded. Test this +- * and retun success when trace point kvm_s390_create_vm +- * exists. Otherwise this test always fails. +- */ +-static bool kvm_s390_create_vm_valid(void) +-{ +- char *eventfile; +- bool rc = false; +- +- eventfile = get_events_file("kvm-s390"); +- +- if (eventfile) { +- DIR *mydir = opendir(eventfile); +- +- if (mydir) { +- rc = true; +- closedir(mydir); +- } +- put_events_file(eventfile); +- } +- +- return rc; +-} +-#endif +- + static int test__checkevent_tracepoint(struct perf_evlist *evlist) + { + struct perf_evsel *evsel = perf_evlist__first(evlist); +@@ -1626,7 +1600,6 @@ static struct evlist_test test__events[] = { + { + .name = "kvm-s390:kvm_s390_create_vm", + .check = test__checkevent_tracepoint, +- .valid = kvm_s390_create_vm_valid, + .id = 100, + }, + #endif +-- +2.20.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 8b9e56b3ee1..bd20c217373 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -60,3 +60,4 @@ mm-zsmalloc.c-fix-race-condition-in-zs_destroy_pool.patch xfs-fix-missing-ilock-unlock-when-xfs_setattr_nonsize-fails-due-to-edquot.patch dm-zoned-fix-potential-null-dereference-in-dmz_do_re.patch powerpc-allow-flush_-inval_-dcache_range-to-work-across-ranges-4gb.patch +revert-perf-test-6-fix-missing-kvm-module-load-for-s.patch -- 2.47.3