diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:52 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 16:11:52 +0200 |
| commit | 5806b81ac1c0c52665b91723fd4146a4f86e386b (patch) | |
| tree | 24ea8763bf308ce1407c1de91dc8de4d2655e1c1 /Makefile | |
| parent | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 (diff) | |
| parent | 6712e299b7dc78aa4971b85e803435ee6d49a9dd (diff) | |
| download | linux-3.10-5806b81ac1c0c52665b91723fd4146a4f86e386b.tar.gz linux-3.10-5806b81ac1c0c52665b91723fd4146a4f86e386b.tar.bz2 linux-3.10-5806b81ac1c0c52665b91723fd4146a4f86e386b.zip | |
Merge branch 'auto-ftrace-next' into tracing/for-linus
Conflicts:
arch/x86/kernel/entry_32.S
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/lib/Makefile
include/asm-x86/irqflags.h
kernel/Makefile
kernel/sched.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -528,6 +528,10 @@ KBUILD_CFLAGS += -g KBUILD_AFLAGS += -gdwarf-2 endif +ifdef CONFIG_FTRACE +KBUILD_CFLAGS += -pg +endif + # We trigger additional mismatches with less inlining ifdef CONFIG_DEBUG_SECTION_MISMATCH KBUILD_CFLAGS += $(call cc-option, -fno-inline-functions-called-once) |