diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-02-15 16:38:33 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-02-15 16:38:33 +0100 |
| commit | 6a71e69f78fbcb453f4444a8288ea8b7cdc7cea4 (patch) | |
| tree | 9d4dd00367eeb909edf4c1a30e2e8178efb9dc5a /kernel | |
| parent | a3d4fd7a2d81604fedfa270d29c824b8d3380c2e (diff) | |
| parent | 02e176af92f3e2e9ec3a48792036566af2dcd534 (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
* Fix cleanup in case of kzalloc failure, from Daniel Baluta.
* Limit unwind support to x86 archs, fix from Jiri Olsa.
* Initial GTK+ annotate browser, from Namhyung Kim.
* Fix build with bison 2.3 and older, from Vinson Lee.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/events/hw_breakpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c index fe8a916507e..a64f8aeb5c1 100644 --- a/kernel/events/hw_breakpoint.c +++ b/kernel/events/hw_breakpoint.c @@ -676,7 +676,7 @@ int __init init_hw_breakpoint(void) err_alloc: for_each_possible_cpu(err_cpu) { for (i = 0; i < TYPE_MAX; i++) - kfree(per_cpu(nr_task_bp_pinned[i], cpu)); + kfree(per_cpu(nr_task_bp_pinned[i], err_cpu)); if (err_cpu == cpu) break; } |