Commit 041de0e9 authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman

Revert "perf test 6: Fix missing kvm module load for s390"

This reverts commit 9a501cdb.

Which was upstream commit 53fe307d.

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: default avatarSasha Levin <sashal@kernel.org>
parent 4862942c
...@@ -12,32 +12,6 @@ ...@@ -12,32 +12,6 @@
#define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \ #define PERF_TP_SAMPLE_TYPE (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | \
PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD) 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) static int test__checkevent_tracepoint(struct perf_evlist *evlist)
{ {
struct perf_evsel *evsel = perf_evlist__first(evlist); struct perf_evsel *evsel = perf_evlist__first(evlist);
...@@ -1619,7 +1593,6 @@ static struct evlist_test test__events[] = { ...@@ -1619,7 +1593,6 @@ static struct evlist_test test__events[] = {
{ {
.name = "kvm-s390:kvm_s390_create_vm", .name = "kvm-s390:kvm_s390_create_vm",
.check = test__checkevent_tracepoint, .check = test__checkevent_tracepoint,
.valid = kvm_s390_create_vm_valid,
.id = 100, .id = 100,
}, },
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment