From: Frederic Weisbecker Date: Sun, 16 Nov 2008 04:59:52 +0000 (+0100) Subject: tracing/branch-tracer: fix a trace recursion on branch tracer X-Git-Tag: v2.6.29-rc1~586^2~59 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=072b40a15616fe6bea68466e6bffcfcbf5c8f26f;p=pandora-kernel.git tracing/branch-tracer: fix a trace recursion on branch tracer Impact: fix crash when enabling the branch-tracer When the branch tracer inserts an event through probe_likely_condition(), it calls local_irq_save() and then results in a trace recursion. local_irq_save() -> trace_hardirqs_off() -> trace_hardirqs_off_caller() -> unlikely() The trace_branch.c file is protected by DISABLE_BRANCH_PROFILING but that doesn't prevent from external call to functions that use unlikely(). My box crashed each time I tried to set this tracer (sudden and hard reboot). Signed-off-by: Frederic Weisbecker Signed-off-by: Ingo Molnar --- Reading git-diff-tree failed