From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 11:41:27 +0000 (+0200)
Subject: Merge branch 'linus' into x86/paravirt-spinlocks
X-Git-Tag: v2.6.27-rc1~955^2^2~2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b;p=linux.git

Merge branch 'linus' into x86/paravirt-spinlocks

Conflicts:

	arch/x86/kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

2fb5e1e101d1b1c9a1aeca7ad99a02b49241ba7b
diff --cc arch/x86/kernel/Makefile
index 78d52171400b,da140611bb57..058c5594f493
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -7,11 -7,9 +7,10 @@@ extra-y                := head_$(BITS).
  CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
  
  ifdef CONFIG_FTRACE
 -# Do not profile debug utilities
 +# Do not profile debug and lowlevel utilities
- CFLAGS_REMOVE_tsc_64.o = -pg
- CFLAGS_REMOVE_tsc_32.o = -pg
+ CFLAGS_REMOVE_tsc.o = -pg
  CFLAGS_REMOVE_rtc.o = -pg
 +CFLAGS_REMOVE_paravirt.o = -pg
  endif
  
  #