summaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>2015-02-17 14:14:36 -0500
committerMichael Ellerman <mpe@ellerman.id.au>2015-04-11 20:49:27 +1000
commitb816ce67fcb57f9d51681cb3d26fd6598b4351ed (patch)
tree494dd4205f48ed01d81905cc3229e698849366c8 /arch/powerpc
parentaeab199d84c2616ffc5e29aa4831bd8a660bde96 (diff)
downloadtalos-obmc-linux-b816ce67fcb57f9d51681cb3d26fd6598b4351ed.tar.gz
talos-obmc-linux-b816ce67fcb57f9d51681cb3d26fd6598b4351ed.zip
powerpc/perf/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> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/perf/hv-24x7.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index 46be032f60ad..ead8878ca62b 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;
}
OpenPOWER on IntegriCloud