Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 643d2d79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of... 

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Put back -pg to tsc.o and add no GCOV to vread_tsc_64.o
parents 89c12223 89e1be50

arch/x86/kernel/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE) 


ifdef CONFIG_FUNCTION_TRACER

# Do not profile debug and lowlevel utilities

CFLAGS_REMOVE_tsc.o = -pg

CFLAGS_REMOVE_rtc.o = -pg

CFLAGS_REMOVE_paravirt-spinlocks.o = -pg

CFLAGS_REMOVE_pvclock.o = -pg
@@ -28,6 +29,7 @@ CFLAGS_paravirt.o := $(nostackp) 
GCOV_PROFILE_vsyscall_64.o	:= n

GCOV_PROFILE_hpet.o		:= n

GCOV_PROFILE_tsc.o		:= n

GCOV_PROFILE_vread_tsc_64.o	:= n

GCOV_PROFILE_paravirt.o		:= n



# vread_tsc_64 is hot and should be fully optimized: