Commit-ID: 258af47479980d8238a04568b94a4e55aa1cb537 Gitweb: http://git.kernel.org/tip/258af47479980d8238a04568b94a4e55aa1cb537 Author: Steven Rostedt <srostedt@xxxxxxxxxx> AuthorDate: Wed, 22 Sep 2010 22:22:25 -0400 Committer: Steven Rostedt <rostedt@xxxxxxxxxxx> CommitDate: Wed, 22 Sep 2010 23:01:19 -0400 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@xxxxxxxxxx Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx> Cc: Avi Kivity <avi@xxxxxxxxxx> Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx> --- arch/x86/kernel/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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_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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|