diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2013-04-12 07:05:54 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-04-12 08:33:56 +0400 |
| commit | c481420248c6730246d2a1b1773d5d7007ae0835 (patch) | |
| tree | 492f68be5a65be30745b24bb07628c95ba0cd2a4 | |
| parent | 75761cc15877c155b3849b4e0e0cb3f897faf471 (diff) | |
| download | linux-c481420248c6730246d2a1b1773d5d7007ae0835.tar.xz | |
perf: Fix error return code
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>
| -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 7f0d67ea3f48..7e0962ed7f8a 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5987,6 +5987,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; |