diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-12-18 10:35:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-12-18 10:35:16 +0100 |
commit | 6e5ed276374c329b93a968d640f4d26c8c05411b (patch) | |
tree | 3b0d42269f0f52ea7764511de3a58b01d12bcb23 /tools/perf/util/session.c | |
parent | x86/mrst: Add additional debug prints for pb_keys (diff) | |
parent | Linux 3.2-rc6 (diff) | |
download | linux-6e5ed276374c329b93a968d640f4d26c8c05411b.tar.xz linux-6e5ed276374c329b93a968d640f4d26c8c05411b.zip |
Merge commit 'v3.2-rc6' into x86/platform
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r-- | tools/perf/util/session.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 85c1e6b76f0a..0f4555ce9063 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -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]; |