[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-9ecd4e1689208afe9b059a5ce1333acb2f42c4d2@git.kernel.org>
Date: Thu, 23 Sep 2010 07:22:03 GMT
From: tip-bot for Jeremy Fitzhardinge <jeremy@...p.org>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, jeremy@...p.org, hpa@...or.com,
mingo@...hat.com, rostedt@...dmis.org, tglx@...utronix.de,
jeremy.fitzhardinge@...rix.com
Subject: [tip:perf/urgent] tracing/x86: Don't use mcount in pvclock.c
Commit-ID: 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2
Gitweb: http://git.kernel.org/tip/9ecd4e1689208afe9b059a5ce1333acb2f42c4d2
Author: Jeremy Fitzhardinge <jeremy@...p.org>
AuthorDate: Wed, 22 Sep 2010 17:07:27 -0700
Committer: Steven Rostedt <rostedt@...dmis.org>
CommitDate: Wed, 22 Sep 2010 23:00:50 -0400
tracing/x86: Don't use mcount in pvclock.c
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.
Cc: stable@...nel.org
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@...rix.com>
LKML-Reference: <4C9A9A3F.4040201@...p.org>
Signed-off-by: Steven Rostedt <rostedt@...dmis.org>
---
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 0925676..882bbff 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists