Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323719
b: refs/heads/master
c: a2546fa
h: refs/heads/master
i:
  323717: 748881e
  323715: 4f3d5bc
  323711: 2fe4743
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Aug 23, 2012
1 parent 271d22a commit 8b11c09
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 48bb5dc6cd9d30fe0d594947563da1f8bd9abada
refs/heads/master: a2546fae01124fb8063747439300fcf39bac033a
6 changes: 5 additions & 1 deletion trunk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions trunk/kernel/trace/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8b11c09

Please sign in to comment.