Re: [PATCH] x86: don't use mcount in pvclock.c

[Steven Rostedt <rostedt@goodmis.org>]

Crap!

I fixed this back on 7/1/2010 from a RHEL bugzilla report, and forgot to
push it mainline. This also requires kvmclock.o to have the -pg as well.

I'll add your patch and add the kvmclock.o too.

Thanks,

-- Steve


On Wed, 2010-09-22 at 17:07 -0700, Jeremy Fitzhardinge wrote:
> 
> 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>
> 
> diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
> index f3477bb..35b447c 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
>