From: Sukadev Bhattiprolu Date: Tue, 17 Feb 2015 19:14:36 +0000 (-0500) Subject: powerpc/perf/hv-24x7: Add missing put_cpu_var() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b816ce67fcb57f9d51681cb3d26fd6598b4351ed;p=linux-beck.git 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 Signed-off-by: Michael Ellerman --- 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; }