aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2010-02-10 11:25:17 -0500
committerFrederic Weisbecker <fweisbec@gmail.com>2010-02-17 07:13:08 -0500
commitf850c30c8b426ba1688cb63b1a3e534eed03a138 (patch)
treeb01f27bc57b73cf8311c8135be0ffc8e93b16ed6
parente7b8e675d9c71b868b66f62f725a948047514719 (diff)
tracing/kprobes: Make Kconfig dependencies generic
KPROBES_EVENT actually depends on the regs and stack access API (b1cf540f) and not on x86. So introduce a new config option which architectures can select if they have the API implemented and switch x86. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Acked-by: Masami Hiramatsu <mhiramat@redhat.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> LKML-Reference: <20100210162517.GB6933@osiris.boeblingen.de.ibm.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
-rw-r--r--arch/Kconfig3
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--kernel/trace/Kconfig2
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index 9d055b4f0585..04e3aa77da25 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -121,6 +121,9 @@ config HAVE_DMA_ATTRS
121config USE_GENERIC_SMP_HELPERS 121config USE_GENERIC_SMP_HELPERS
122 bool 122 bool
123 123
124config HAVE_REGS_AND_STACK_ACCESS_API
125 bool
126
124config HAVE_CLK 127config HAVE_CLK
125 bool 128 bool
126 help 129 help
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 55298e891571..07baa12929b4 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -45,6 +45,7 @@ config X86
45 select HAVE_GENERIC_DMA_COHERENT if X86_32 45 select HAVE_GENERIC_DMA_COHERENT if X86_32
46 select HAVE_EFFICIENT_UNALIGNED_ACCESS 46 select HAVE_EFFICIENT_UNALIGNED_ACCESS
47 select USER_STACKTRACE_SUPPORT 47 select USER_STACKTRACE_SUPPORT
48 select HAVE_REGS_AND_STACK_ACCESS_API
48 select HAVE_DMA_API_DEBUG 49 select HAVE_DMA_API_DEBUG
49 select HAVE_KERNEL_GZIP 50 select HAVE_KERNEL_GZIP
50 select HAVE_KERNEL_BZIP2 51 select HAVE_KERNEL_BZIP2
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 6c22d8a2f289..40fef552f012 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -451,7 +451,7 @@ config BLK_DEV_IO_TRACE
451 451
452config KPROBE_EVENT 452config KPROBE_EVENT
453 depends on KPROBES 453 depends on KPROBES
454 depends on X86 454 depends on HAVE_REGS_AND_STACK_ACCESS_API
455 bool "Enable kprobes-based dynamic events" 455 bool "Enable kprobes-based dynamic events"
456 select TRACING 456 select TRACING
457 default y 457 default y