aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shishkin <alexander.shishkin@linux.intel.com>2016-04-28 11:35:44 -0400
committerIngo Molnar <mingo@kernel.org>2016-05-05 04:16:29 -0400
commit1b6de5917172967acd8db4d222df4225d23a8a60 (patch)
tree111bb93461f8df8a32c2ee6d462d9bd76ad9175c
parent65c7e6f1c4810e9bce935520f44f6d2613cd1b40 (diff)
perf/x86/intel/pt: Convert ACCESS_ONCE()s
This patch converts remaining ACCESS_ONCE() instances into READ_ONCE() and WRITE_ONCE() as appropriate. Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vince Weaver <vincent.weaver@maine.edu> Cc: vince@deater.net Link: http://lkml.kernel.org/r/1461857746-31346-2-git-send-email-alexander.shishkin@linux.intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/events/intel/pt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/events/intel/pt.c b/arch/x86/events/intel/pt.c
index c3a359cf670e..54fa238d84d5 100644
--- a/arch/x86/events/intel/pt.c
+++ b/arch/x86/events/intel/pt.c
@@ -1135,7 +1135,7 @@ void intel_pt_interrupt(void)
1135 * after PT has been disabled by pt_event_stop(). Make sure we don't 1135 * after PT has been disabled by pt_event_stop(). Make sure we don't
1136 * do anything (particularly, re-enable) for this event here. 1136 * do anything (particularly, re-enable) for this event here.
1137 */ 1137 */
1138 if (!ACCESS_ONCE(pt->handle_nmi)) 1138 if (!READ_ONCE(pt->handle_nmi))
1139 return; 1139 return;
1140 1140
1141 /* 1141 /*
@@ -1237,7 +1237,7 @@ static void pt_event_start(struct perf_event *event, int mode)
1237 goto fail_end_stop; 1237 goto fail_end_stop;
1238 } 1238 }
1239 1239
1240 ACCESS_ONCE(pt->handle_nmi) = 1; 1240 WRITE_ONCE(pt->handle_nmi, 1);
1241 hwc->state = 0; 1241 hwc->state = 0;
1242 1242
1243 pt_config_buffer(buf->cur->table, buf->cur_idx, 1243 pt_config_buffer(buf->cur->table, buf->cur_idx,
@@ -1260,7 +1260,7 @@ static void pt_event_stop(struct perf_event *event, int mode)
1260 * Protect against the PMI racing with disabling wrmsr, 1260 * Protect against the PMI racing with disabling wrmsr,
1261 * see comment in intel_pt_interrupt(). 1261 * see comment in intel_pt_interrupt().
1262 */ 1262 */
1263 ACCESS_ONCE(pt->handle_nmi) = 0; 1263 WRITE_ONCE(pt->handle_nmi, 0);
1264 1264
1265 pt_config_stop(event); 1265 pt_config_stop(event);
1266 1266