releases/2.6.35.8/tracing-x86-don-t-use-mcount-in-pvclock.c.patch

   1 From 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2 Mon Sep 17 00:00:00 2001
   2 From: Jeremy Fitzhardinge <jeremy@goop.org>
   3 Date: Wed, 22 Sep 2010 17:07:27 -0700
   4 Subject: tracing/x86: Don't use mcount in pvclock.c
   5
   6 From: Jeremy Fitzhardinge <jeremy@goop.org>
   7
   8 commit 9ecd4e1689208afe9b059a5ce1333acb2f42c4d2 upstream.
   9
  10 When using a paravirt clock, pvclock.c can be used by sched_clock(),
  11 which in turn is used by the tracing mechanism for timestamps,
  12 which leads to infinite recursion.
  13
  14 Disable mcount/tracing for pvclock.o.
  15
  16 Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
  17 LKML-Reference: <4C9A9A3F.4040201@goop.org>
  18 Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  19 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20
  21 ---
  22  arch/x86/kernel/Makefile |    1 +
  23  1 file changed, 1 insertion(+)
  24
  25 --- a/arch/x86/kernel/Makefile
  26 +++ b/arch/x86/kernel/Makefile
  27 @@ -11,6 +11,7 @@ ifdef CONFIG_FUNCTION_TRACER
  28  CFLAGS_REMOVE_tsc.o = -pg
  29  CFLAGS_REMOVE_rtc.o = -pg
  30  CFLAGS_REMOVE_paravirt-spinlocks.o = -pg
  31 +CFLAGS_REMOVE_pvclock.o = -pg
  32  CFLAGS_REMOVE_ftrace.o = -pg
  33  CFLAGS_REMOVE_early_printk.o = -pg
  34  endif