| From 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2 Mon Sep 17 00:00:00 2001 |
| From: Jeremy Fitzhardinge <jeremy@goop.org> |
| Date: Wed, 22 Sep 2010 17:07:27 -0700 |
| Subject: tracing/x86: Don't use mcount in pvclock.c |
| |
| From: Jeremy Fitzhardinge <jeremy@goop.org> |
| |
| commit 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2 upstream. |
| |
| 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. |
| |
| Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> |
| LKML-Reference: <4C9A9A3F.4040201@goop.org> |
| Signed-off-by: Steven Rostedt <rostedt@goodmis.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| arch/x86/kernel/Makefile | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- 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 |
