@@ -11,6 +11,11 @@ struct perf_cpu_map;
 struct perf_thread_map;
 struct xyarray;
 
+enum perf_tool_event {
+	PERF_TOOL_NONE		= 0,
+	PERF_TOOL_DURATION_TIME	= 1,
+};
+
 /*
  * Per fd, to map back from PERF_SAMPLE_ID to evsel, only used when there are
  * more than one entry in the evlist.

@@ -62,6 +67,7 @@ struct perf_evsel {
 		bool			auto_merge_stats;
 		struct list_head	config_terms;
 		const char		*metric_id;
+		enum perf_tool_event	tool_event;
 	};
 };
 

@@ -339,7 +339,7 @@ static int evsel__write_stat_event(struct evsel *counter, u32 cpu, u32 thread,
 static int read_single_counter(struct evsel *counter, int cpu,
 			       int thread, struct timespec *rs)
 {
-	if (counter->tool_event == PERF_TOOL_DURATION_TIME) {
+	if (counter->core.tool_event == PERF_TOOL_DURATION_TIME) {
 		u64 val = rs->tv_nsec + rs->tv_sec*1000000000ULL;
 		struct perf_counts_values *count =
 			perf_counts(counter->counts, cpu, thread);

@@ -421,7 +421,7 @@ struct evsel *evsel__clone(struct evsel *orig)
 	evsel->core.leader = orig->core.leader;
 
 	evsel->max_events = orig->max_events;
-	evsel->tool_event = orig->tool_event;
+	evsel->core.tool_event = orig->core.tool_event;
 	evsel->unit = orig->unit;
 	evsel->scale = orig->scale;
 	evsel->snapshot = orig->snapshot;

@@ -756,7 +756,7 @@ const char *evsel__name(struct evsel *evsel)
 		break;
 
 	case PERF_TYPE_SOFTWARE:
-		if (evsel->tool_event)
+		if (evsel->core.tool_event)
 			evsel__tool_name(bf, sizeof(bf));
 		else
 			evsel__sw_name(evsel, bf, sizeof(bf));

@@ -789,7 +789,7 @@ const char *evsel__metric_id(const struct evsel *evsel)
 	if (evsel->core.metric_id)
 		return evsel->core.metric_id;
 
-	if (evsel->core.attr.type == PERF_TYPE_SOFTWARE && evsel->tool_event)
+	if (evsel->core.attr.type == PERF_TYPE_SOFTWARE && evsel->core.tool_event)
 		return "duration_time";
 
 	return "unknown";

@@ -25,11 +25,6 @@ struct bperf_follower_bpf;
 
 typedef int (evsel__sb_cb_t)(union perf_event *event, void *data);
 
-enum perf_tool_event {
-	PERF_TOOL_NONE		= 0,
-	PERF_TOOL_DURATION_TIME = 1,
-};
-
 /** struct evsel - event selector
  *
  * @evlist - evlist this evsel is in, if it is in one.

@@ -67,7 +62,6 @@ struct evsel {
 		double			scale;
 		const char		*unit;
 		struct cgroup		*cgrp;
-		enum perf_tool_event	tool_event;
 		/* parse modifier helper */
 		int			exclude_GH;
 		int			sample_read;

@@ -434,7 +434,7 @@ static int add_event_tool(struct list_head *list, int *idx,
 			    /*cpu_list=*/"0");
 	if (!evsel)
 		return -ENOMEM;
-	evsel->tool_event = tool_event;
+	evsel->core.tool_event = tool_event;
 	if (tool_event == PERF_TOOL_DURATION_TIME)
 		evsel->unit = "ns";
 	return 0;