diff options
| author | Ingo Molnar | 2017-11-07 10:51:10 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-11-07 10:51:10 +0100 |
| commit | 141d3b1daacd11bdbd6fa74c2b163093e10d17ee (patch) | |
| tree | 04c98496f16ad2fe34c0cf4f31fedf4fe558c017 /tools/perf/util/session.c | |
| parent | x86/vector/msi: Select CONFIG_GENERIC_IRQ_RESERVATION_MODE (diff) | |
| parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | kernel-qcow2-linux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.gz kernel-qcow2-linux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.tar.xz kernel-qcow2-linux-141d3b1daacd11bdbd6fa74c2b163093e10d17ee.zip | |
Merge branch 'linus' into x86/apic, to resolve conflicts
Conflicts:
arch/x86/include/asm/x2apic.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/session.c')
| -rw-r--r-- | tools/perf/util/session.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index a7ebd9fe8e40..da55081aefc6 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 #include <errno.h> #include <inttypes.h> #include <linux/kernel.h> @@ -374,6 +375,8 @@ void perf_tool__fill_defaults(struct perf_tool *tool) tool->mmap2 = process_event_stub; if (tool->comm == NULL) tool->comm = process_event_stub; + if (tool->namespaces == NULL) + tool->namespaces = process_event_stub; if (tool->fork == NULL) tool->fork = process_event_stub; if (tool->exit == NULL) |