diff mbox

[1/1] powerpc/hv-24x7: Add missing put_cpu_var()

Message ID 20150331015117.GA32741@us.ibm.com (mailing list archive)
State Accepted
Commit b816ce67fcb57f9d51681cb3d26fd6598b4351ed
Delegated to: Michael Ellerman
Headers show

Commit Message

Sukadev Bhattiprolu March 31, 2015, 1:51 a.m. UTC 
From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Date: Tue, 17 Feb 2015 14:14:36 -0500
Subject: [PATCH 1/1] powerpc/hv-24x7: Add missing put_cpu_var()

Add missing put_cpu_var() for 24x7 requests. This went missing in
commit f34b6c7 (3.18-rc3).

Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
---
 arch/powerpc/perf/hv-24x7.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 46be032..ead8878 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -1096,7 +1096,7 @@  static unsigned long single_24x7_request(struct perf_event *event, u64 *count)
 
 	ret = add_event_to_24x7_request(event, request_buffer);
 	if (ret)
-		return ret;
+		goto out;
 
 	ret = make_24x7_request(request_buffer, result_buffer);
 	if (ret) {
@@ -1109,6 +1109,8 @@  static unsigned long single_24x7_request(struct perf_event *event, u64 *count)
 	*count = be64_to_cpu(resb->elements[0].element_data[0]);
 
 out:
+	put_cpu_var(hv_24x7_reqb);
+	put_cpu_var(hv_24x7_resb);
 	return ret;
 }