From: Jeremy Fitzhardinge Subject: [PATCH] x86: don't use mcount in pvclock.c Date: Wed, 22 Sep 2010 17:07:27 -0700 Message-ID: <4C9A9A3F.4040201@goop.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: Sender: linux-kernel-owner@vger.kernel.org To: the arch/x86 maintainers Cc: Steven Rostedt , Linux Kernel Mailing List , "Xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org 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 diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index f3477bb..35b447c 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