diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-10-05 09:47:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-05 09:47:14 +0200 |
commit | 00e8976200665eec2fa9264d61885b4d1384d4f0 (patch) | |
tree | 5554648e4411fcd6909214f71370348567cf4b2d /arch/x86/kernel/Makefile | |
parent | 540804b5c52065a87d826f7714b18a3ec0b269f9 (diff) | |
parent | 0f940cb7d970f4fd569bb5f9f49774422f2ccbee (diff) | |
download | kernel_samsung_smdk4412-00e8976200665eec2fa9264d61885b4d1384d4f0.zip kernel_samsung_smdk4412-00e8976200665eec2fa9264d61885b4d1384d4f0.tar.gz kernel_samsung_smdk4412-00e8976200665eec2fa9264d61885b4d1384d4f0.tar.bz2 |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/util/ui/browsers/hists.c
Merge reason: fix the conflict and merge in changes for dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-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 24fa171..9d3f485 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile @@ -11,6 +11,8 @@ ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_tsc.o = -pg CFLAGS_REMOVE_rtc.o = -pg CFLAGS_REMOVE_paravirt-spinlocks.o = -pg +CFLAGS_REMOVE_pvclock.o = -pg +CFLAGS_REMOVE_kvmclock.o = -pg CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_early_printk.o = -pg endif |