]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
tracing/x86: Don't use mcount in kvmclock.c
authorSteven Rostedt <srostedt@redhat.com>
Thu, 23 Sep 2010 02:22:25 +0000 (22:22 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Thu, 23 Sep 2010 03:01:19 +0000 (23:01 -0400)
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

index 882bbff9d50b4e59775fd57d26cfc685d97c160f..fedf32a8c3ecdd7a1aaed41b2884d2c9b10bf033 100644 (file)
@@ -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