commit 258af47479980d8238a04568b94a4e55aa1cb537
author Steven Rostedt <srostedt@redhat.com> Wed Sep 22 22:22:25 2010 -0400
committer Steven Rostedt <rostedt@goodmis.org> Wed Sep 22 23:01:19 2010 -0400
tree 216c769560aa3f161823678ba725d17febd83bff
parent 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2

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>

arch/x86/kernel/Makefile

diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 882bbff..fedf32a 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -12,6 +12,7 @@
 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