diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:37:10 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 13:37:10 -0400 |
| commit | bdec6cace4c3ecb6f90bcaa5424b92c97bd1df0f (patch) | |
| tree | dd9705b6facd753cc0e239016c0f7618c74cba19 /arch | |
| parent | 2f73ccab5628b4f8e8f4b93fea8082dd31a87a10 (diff) | |
| parent | 2464a609ded094204a3aed24823745ec58e3c879 (diff) | |
Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ftrace: do not trace library functions
ftrace: do not trace scheduler functions
ftrace: fix lockup with MAXSMP
ftrace: fix merge buglet
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 5112c84f5421..da140611bb57 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
| @@ -8,8 +8,7 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE) | |||
| 8 | 8 | ||
| 9 | ifdef CONFIG_FTRACE | 9 | ifdef CONFIG_FTRACE |
| 10 | # Do not profile debug utilities | 10 | # Do not profile debug utilities |
| 11 | CFLAGS_REMOVE_tsc_64.o = -pg | 11 | CFLAGS_REMOVE_tsc.o = -pg |
| 12 | CFLAGS_REMOVE_tsc_32.o = -pg | ||
| 13 | CFLAGS_REMOVE_rtc.o = -pg | 12 | CFLAGS_REMOVE_rtc.o = -pg |
| 14 | endif | 13 | endif |
| 15 | 14 | ||