Revert "perf test 6: Fix missing kvm module load for s390"
This reverts commit 5f18429ae4
.
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 <sashal@kernel.org>
This commit is contained in:
parent
b7a27ca75b
commit
f5a3392464
1 changed files with 0 additions and 27 deletions
|
@ -12,32 +12,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);
|
||||
|
@ -1587,7 +1561,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
|
||||
|
|
Loading…
Add table
Reference in a new issue