From: Peter Zijlstra Date: Thu, 13 Aug 2009 09:47:54 +0000 (+0200) Subject: perf_counter: Fix an ipi-deadlock X-Git-Tag: v2.6.31-rc6~2^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=970892a9031a5dc7217bd394fb9d89fa75a4a7bc;p=pandora-kernel.git perf_counter: Fix an ipi-deadlock perf_pending_counter() is called from IRQ context and will call perf_counter_disable(), however perf_counter_disable() uses smp_call_function_single() which doesn't fancy being used with IRQs disabled due to IPI deadlocks. Fix this by making it use the local __perf_counter_disable() call and teaching the counter_sched_out() code about pending disables as well. This should cover the case where a counter migrates before the pending queue gets processed. Signed-off-by: Peter Zijlstra Cc: Corey J Ashford Cc: Paul Mackerras Cc: stephane eranian LKML-Reference: <20090813103655.244097721@chello.nl> Signed-off-by: Ingo Molnar --- Reading git-diff-tree failed