diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-27 11:31:44 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-27 11:31:44 +0300 |
| commit | 6856b8e53609ee3eff7e3173e4e5d979f47d834d (patch) | |
| tree | c2f9e364889fa07e20081b198a085a4ed7b26bd3 /arch/x86/events | |
| parent | 57646b6fda9b751e62929c73b1e6df06b108a3c9 (diff) | |
| parent | 2eece390bf68ec8f733d7e4a3ba8a5ea350082ae (diff) | |
| download | linux-6856b8e53609ee3eff7e3173e4e5d979f47d834d.tar.xz | |
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')
| -rw-r--r-- | arch/x86/events/intel/bts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c index 16076eb34699..141e07b06216 100644 --- a/arch/x86/events/intel/bts.c +++ b/arch/x86/events/intel/bts.c @@ -546,9 +546,6 @@ static int bts_event_init(struct perf_event *event) if (event->attr.type != bts_pmu.type) return -ENOENT; - if (x86_add_exclusive(x86_lbr_exclusive_bts)) - return -EBUSY; - /* * BTS leaks kernel addresses even when CPL0 tracing is * disabled, so disallow intel_bts driver for unprivileged @@ -562,6 +559,9 @@ static int bts_event_init(struct perf_event *event) !capable(CAP_SYS_ADMIN)) return -EACCES; + if (x86_add_exclusive(x86_lbr_exclusive_bts)) + return -EBUSY; + ret = x86_reserve_hardware(); if (ret) { x86_del_exclusive(x86_lbr_exclusive_bts); |