Merge branch 'perf/urgent' of git://github.com/acmel/linux into perf/urgent
This commit is contained in:
commit
2c3757e54e
|
@ -34,6 +34,16 @@ int __perf_evsel__sample_size(u64 sample_type)
|
|||
return size;
|
||||
}
|
||||
|
||||
static void hists__init(struct hists *hists)
|
||||
{
|
||||
memset(hists, 0, sizeof(*hists));
|
||||
hists->entries_in_array[0] = hists->entries_in_array[1] = RB_ROOT;
|
||||
hists->entries_in = &hists->entries_in_array[0];
|
||||
hists->entries_collapsed = RB_ROOT;
|
||||
hists->entries = RB_ROOT;
|
||||
pthread_mutex_init(&hists->lock, NULL);
|
||||
}
|
||||
|
||||
void perf_evsel__init(struct perf_evsel *evsel,
|
||||
struct perf_event_attr *attr, int idx)
|
||||
{
|
||||
|
|
|
@ -1211,13 +1211,3 @@ size_t hists__fprintf_nr_events(struct hists *hists, FILE *fp)
|
|||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void hists__init(struct hists *hists)
|
||||
{
|
||||
memset(hists, 0, sizeof(*hists));
|
||||
hists->entries_in_array[0] = hists->entries_in_array[1] = RB_ROOT;
|
||||
hists->entries_in = &hists->entries_in_array[0];
|
||||
hists->entries_collapsed = RB_ROOT;
|
||||
hists->entries = RB_ROOT;
|
||||
pthread_mutex_init(&hists->lock, NULL);
|
||||
}
|
||||
|
|
|
@ -63,8 +63,6 @@ struct hists {
|
|||
struct callchain_cursor callchain_cursor;
|
||||
};
|
||||
|
||||
void hists__init(struct hists *hists);
|
||||
|
||||
struct hist_entry *__hists__add_entry(struct hists *self,
|
||||
struct addr_location *al,
|
||||
struct symbol *parent, u64 period);
|
||||
|
|
|
@ -1333,6 +1333,10 @@ int perf_session__cpu_bitmap(struct perf_session *session,
|
|||
}
|
||||
|
||||
map = cpu_map__new(cpu_list);
|
||||
if (map == NULL) {
|
||||
pr_err("Invalid cpu_list\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (i = 0; i < map->nr; i++) {
|
||||
int cpu = map->map[i];
|
||||
|
|
Loading…
Reference in New Issue