From: Jeremy Fitzhardinge Date: Thu, 23 Sep 2010 00:07:27 +0000 (-0700) Subject: tracing/x86: Don't use mcount in pvclock.c X-Git-Tag: v2.6.35.8~75 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f574ccce1edf756c98a7ab5d7a95f84b59c897fe;p=karo-tx-linux.git tracing/x86: Don't use mcount in pvclock.c commit 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2 upstream. When using a paravirt clock, pvclock.c can be used by sched_clock(), which in turn is used by the tracing mechanism for timestamps, which leads to infinite recursion. Disable mcount/tracing for pvclock.o. Signed-off-by: Jeremy Fitzhardinge LKML-Reference: <4C9A9A3F.4040201@goop.org> Signed-off-by: Steven Rostedt Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index e77b22083721..f3f34411c8e3 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -11,6 +11,7 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_tsc.o = -pg CFLAGS_REMOVE_rtc.o = -pg CFLAGS_REMOVE_paravirt-spinlocks.o = -pg +CFLAGS_REMOVE_pvclock.o = -pg CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_early_printk.o = -pg endif