From: Steven Rostedt <srostedt@redhat.com>
Date: Thu, 23 Sep 2010 02:22:25 +0000 (-0400)
Subject: tracing/x86: Don't use mcount in kvmclock.c
X-Git-Tag: v2.6.36-rc6~20^2~1
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=258af47479980d8238a04568b94a4e55aa1cb537;p=net-next-2.6.git

tracing/x86: Don't use mcount in kvmclock.c

The guest can use the paravirt clock in kvmclock.c which is used
by sched_clock(), which in turn is used by the tracing mechanism
for timestamps, which leads to infinite recursion.

Disable mcount/tracing for kvmclock.o.

Cc: stable@kernel.org
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Avi Kivity <avi@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 882bbff9d50..fedf32a8c3e 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -12,6 +12,7 @@ CFLAGS_REMOVE_tsc.o = -pg
 CFLAGS_REMOVE_rtc.o = -pg
 CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
 CFLAGS_REMOVE_pvclock.o = -pg
+CFLAGS_REMOVE_kvmclock.o = -pg
 CFLAGS_REMOVE_ftrace.o = -pg
 CFLAGS_REMOVE_early_printk.o = -pg
 endif