From 8b11c096190431ebd1765a6cd83876670720eea9 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 9 Feb 2011 13:15:59 -0500 Subject: [PATCH] --- yaml --- r: 323719 b: refs/heads/master c: a2546fae01124fb8063747439300fcf39bac033a h: refs/heads/master i: 323717: 748881e8258ed643cd289c372c7f6d4a83b3ffd5 323715: 4f3d5bc267a89caa2f27016eb1bc234bd72a7f47 323711: 2fe474357630908c5d6553c1a3ba57e0a50a0f48 v: v3 --- [refs] | 2 +- trunk/Makefile | 6 +++++- trunk/kernel/trace/Kconfig | 5 +++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a600cfd93d8e..e1fa02a05cda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48bb5dc6cd9d30fe0d594947563da1f8bd9abada +refs/heads/master: a2546fae01124fb8063747439300fcf39bac033a diff --git a/trunk/Makefile b/trunk/Makefile index ddf5be952e45..e7ca93f17851 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -609,7 +609,11 @@ KBUILD_CFLAGS += $(call cc-option, -femit-struct-debug-baseonly) endif ifdef CONFIG_FUNCTION_TRACER -KBUILD_CFLAGS += -pg +ifdef CONFIG_HAVE_FENTRY +CC_USING_FENTRY := $(call cc-option, -mfentry -DCC_USING_FENTRY) +endif +KBUILD_CFLAGS += -pg $(CC_USING_FENTRY) +KBUILD_AFLAGS += $(CC_USING_FENTRY) ifdef CONFIG_DYNAMIC_FTRACE ifdef CONFIG_HAVE_C_RECORDMCOUNT BUILD_C_RECORDMCOUNT := y diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig index 8c4c07071cc5..9301a0e35e0c 100644 --- a/trunk/kernel/trace/Kconfig +++ b/trunk/kernel/trace/Kconfig @@ -49,6 +49,11 @@ config HAVE_SYSCALL_TRACEPOINTS help See Documentation/trace/ftrace-design.txt +config HAVE_FENTRY + bool + help + Arch supports the gcc options -pg with -mfentry + config HAVE_C_RECORDMCOUNT bool help