]> git.baikalelectronics.ru Git - kernel.git/commit
perf_event: Make software events work again
authorPaul Mackerras <paulus@samba.org>
Sat, 8 May 2010 10:58:00 +0000 (20:58 +1000)
committerIngo Molnar <mingo@elte.hu>
Sat, 8 May 2010 11:16:55 +0000 (13:16 +0200)
commit9c5466dbb3ac2b51e84c3a9327330d199fc43e88
tree39d5a0c81c4cc54c8051a9f62b587f17b0a2077a
parent32a471a5cac4d46a6016c0689e0568aeda19afc9
perf_event: Make software events work again

Commit 0d90e528b4f22f10437d9f42115053dd51105015 ("perf: Add
group scheduling transactional APIs") added code to allow a
group to be scheduled in a single transaction.  However, it
introduced a bug in handling events whose pmu does not implement
transactions -- at the end of scheduling in the events in the
group, in the non-transactional case the code now falls through
to the group_error label, and proceeds to unschedule all the
events in the group and return failure.

This fixes it by returning 0 (success) in the non-transactional
case.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Lin Ming <ming.m.lin@intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: eranian@gmail.com
LKML-Reference: <20100508105800.GB10650@brick.ozlabs.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c