diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 20:32:54 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-31 20:32:54 +0900 |
| commit | 643d2d7992f4ce4f983d455b579f77b1e9c0af0c (patch) | |
| tree | ebd1421f10881ba0da431a3c05fc0f31feb15176 /arch | |
| parent | 89c122236e60747f920008c9cf4e9cbde3333e50 (diff) | |
| parent | 89e1be50c68eb5e58b873dce87bbac627ee18d1f (diff) | |
| download | linux-stable-643d2d7992f4ce4f983d455b579f77b1e9c0af0c.tar.gz linux-stable-643d2d7992f4ce4f983d455b579f77b1e9c0af0c.tar.bz2 linux-stable-643d2d7992f4ce4f983d455b579f77b1e9c0af0c.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index f5abe3a245b8..90b06d4daee2 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -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: |