diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-12 11:05:54 +0800 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-13 15:02:32 +0100 |
| commit | 4221c304a05e4279d9f378519e81c6c69bc6fc4d (patch) | |
| tree | 224864210dd3b5127a5df35d19425a41e411690c /kernel | |
| parent | cd945654552d978b84c0825c7206b2d0667a1272 (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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 7d1f05e57d6..d23dfa713ec 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5756,6 +5756,7 @@ skip_type: 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; |