Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / tools / perf / builtin-record.c

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index cc801fe..b3509d9 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -910,7 +910,8 @@ static int record__open(struct record *rec)
                 * Enable the dummy event when the process is forked for
                 * initial_delay, immediately for system wide.
                 */
-               if (opts->initial_delay && !pos->immediate)
+               if (opts->initial_delay && !pos->immediate &&
+                   !target__has_cpu(&opts->target))
                        pos->core.attr.enable_on_exec = 1;
                else
                        pos->immediate = 1;
@@ -2756,7 +2757,7 @@ int cmd_record(int argc, const char **argv)
 
        if (rec->opts.affinity != PERF_AFFINITY_SYS) {
                rec->affinity_mask.nbits = cpu__max_cpu();
-               rec->affinity_mask.bits = bitmap_alloc(rec->affinity_mask.nbits);
+               rec->affinity_mask.bits = bitmap_zalloc(rec->affinity_mask.nbits);
                if (!rec->affinity_mask.bits) {
                        pr_err("Failed to allocate thread mask for %zd cpus\n", rec->affinity_mask.nbits);
                        err = -ENOMEM;