diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
commit | 1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch) | |
tree | 170002288786f702e1d4ca638b53d1594a7caa16 /arch/x86/events/amd | |
parent | Merge tag 'perf-core-for-mingo-20160429' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | perf/x86/amd/iommu: Do not register a task ctx for uncore like PMUs (diff) | |
download | linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.xz linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/events/amd')
-rw-r--r-- | arch/x86/events/amd/iommu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index 40625ca7a190..6011a573dd64 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -474,6 +474,7 @@ static __init int _init_perf_amd_iommu( static struct perf_amd_iommu __perf_iommu = { .pmu = { + .task_ctx_nr = perf_invalid_context, .event_init = perf_iommu_event_init, .add = perf_iommu_add, .del = perf_iommu_del, |