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.36-rc6~20^2~2 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=9ecd4e1689208afe9b059a5ce1333acb2f42c4d2;p=~shefty%2Frdma-dev.git tracing/x86: Don't use mcount in pvclock.c 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. Cc: stable@kernel.org Signed-off-by: Jeremy Fitzhardinge LKML-Reference: <4C9A9A3F.4040201@goop.org> Signed-off-by: Steven Rostedt --- diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 0925676266b..882bbff9d50 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