]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 26 Sep 2012 06:57:22 +0000 (08:57 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 26 Sep 2012 06:57:22 +0000 (08:57 +0200)
commit7a2bb9eb328eb4084c15e6723114769b347e47c7
tree298177b72d51218a69ffd92a940029c13a3bdde6
parent21c0a946c599ca5a8867cb8988ad81bc870f79f6
parent2c29bd3477ab99c3132807b51ba16277f5e56686
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

Pull perf/core fixes from Arnaldo Carvalho de Melo:

 * The new perf_evsel__tp_sched_test 'perf test' broke the build by setting the
   'ret' variable but not using it, caught by newer gcc
   -Werror=unused-but-set-variable, fix from Namhyung Kim.

 * pevent_parse_event should return a proper PEVENT_ERRNO__ and call
   pevent_free_format on its failure path, fixes from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>