| commit | 8b9ff4fd1fff62d6be14499fbe339a15b5acddf5 | [log] [tgz] |
|---|---|---|
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | Fri Apr 12 11:05:54 2013 +0800 |
| committer | chrmhoffmann <chrmhoffmann@gmail.com> | Sat Aug 12 10:59:48 2017 +0200 |
| tree | 299e3eceed58980986c3187171cf982528a09ddc | |
| parent | d701b8b41225b923daffaa4dd18e9f984f7776d8 [diff] |
perf: Fix error return code commit c481420248c6730246d2a1b1773d5d7007ae0835 upstream. Fix to return -ENOMEM in the allocation error case instead of 0 (if pmu_bus_running == 1), as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Cc: a.p.zijlstra@chello.nl Cc: paulus@samba.org Cc: acme@ghostprotocols.net Link: http://lkml.kernel.org/r/CAPgLHd8j_fWcgqe%3DKLWjpBj%2B%3Do0Pw6Z-SEq%3DNTPU08c2w1tngQ@mail.gmail.com [ Tweaked the error code setting placement and the changelog. ] Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: Rui Xiang <rui.xiang@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Change-Id: I23d950dcfe9c0ac26088b879500fdaff77ef8e8b Original-Change-Id: I6811aea7b0cff0ba02e7caff5533489f40ea2dc2
diff --git a/kernel/events/core.c b/kernel/events/core.c index 1c9f7fe..2c97ffc 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c
@@ -5818,6 +5818,7 @@ if (pmu->pmu_cpu_context) goto got_cpu_context; + ret = -ENOMEM; pmu->pmu_cpu_context = alloc_percpu(struct perf_cpu_context); if (!pmu->pmu_cpu_context) goto free_dev;