perf: Fix CPU hotplug
authorPeter Zijlstra <a.p.zijlstra@chello.nl>
Fri, 11 Jun 2010 11:35:08 +0000 (13:35 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 9 Sep 2010 18:38:52 +0000 (20:38 +0200)
Since we have UP_PREPARE, we should also have UP_CANCELED.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: paulus <paulus@samba.org>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c

Simple merge