projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
[cascardo/linux.git]
/
arch
/
ia64
/
Kconfig
diff --git
a/arch/ia64/Kconfig
b/arch/ia64/Kconfig
index
6183aec
..
8b6a8a5
100644
(file)
--- a/
arch/ia64/Kconfig
+++ b/
arch/ia64/Kconfig
@@
-22,6
+22,9
@@
config IA64
select HAVE_OPROFILE
select HAVE_KPROBES
select HAVE_KRETPROBES
+ select HAVE_FTRACE_MCOUNT_RECORD
+ select HAVE_DYNAMIC_FTRACE if (!ITANIUM)
+ select HAVE_FUNCTION_TRACER
select HAVE_DMA_ATTRS
select HAVE_KVM
select HAVE_ARCH_TRACEHOOK