Messages in this thread Patch in this message | | | Date | Sun, 14 Apr 2013 09:05:25 -0700 | From | tip-bot for Wei Yongjun <> | Subject | [tip:perf/urgent] perf: Fix error return code |
| |
Commit-ID: c481420248c6730246d2a1b1773d5d7007ae0835 Gitweb: http://git.kernel.org/tip/c481420248c6730246d2a1b1773d5d7007ae0835 Author: Wei Yongjun <yongjun_wei@trendmicro.com.cn> AuthorDate: Fri, 12 Apr 2013 11:05:54 +0800 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Fri, 12 Apr 2013 06:33:56 +0200
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> --- kernel/events/core.c | 1 + 1 file changed, 1 insertion(+)
diff --git a/kernel/events/core.c b/kernel/events/core.c index 7f0d67e..7e0962e 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;
| |