From 29c460c3501b47fcb22cb997433c1b976b3fff6b Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 10 Feb 2010 17:25:17 +0100 Subject: [PATCH] --- yaml --- r: 182309 b: refs/heads/master c: f850c30c8b426ba1688cb63b1a3e534eed03a138 h: refs/heads/master i: 182307: d00963317c31eeef918ef96ff70069bbfdfdcac0 v: v3 --- [refs] | 2 +- trunk/arch/Kconfig | 3 +++ trunk/arch/x86/Kconfig | 1 + trunk/kernel/trace/Kconfig | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 20dc64d4c577..38b1cad6ea81 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7b8e675d9c71b868b66f62f725a948047514719 +refs/heads/master: f850c30c8b426ba1688cb63b1a3e534eed03a138 diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig index 9d055b4f0585..04e3aa77da25 100644 --- a/trunk/arch/Kconfig +++ b/trunk/arch/Kconfig @@ -121,6 +121,9 @@ config HAVE_DMA_ATTRS config USE_GENERIC_SMP_HELPERS bool +config HAVE_REGS_AND_STACK_ACCESS_API + bool + config HAVE_CLK bool help diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index 55298e891571..07baa12929b4 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/arch/x86/Kconfig @@ -45,6 +45,7 @@ config X86 select HAVE_GENERIC_DMA_COHERENT if X86_32 select HAVE_EFFICIENT_UNALIGNED_ACCESS select USER_STACKTRACE_SUPPORT + select HAVE_REGS_AND_STACK_ACCESS_API select HAVE_DMA_API_DEBUG select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig index 6c22d8a2f289..40fef552f012 100644 --- a/trunk/kernel/trace/Kconfig +++ b/trunk/kernel/trace/Kconfig @@ -451,7 +451,7 @@ config BLK_DEV_IO_TRACE config KPROBE_EVENT depends on KPROBES - depends on X86 + depends on HAVE_REGS_AND_STACK_ACCESS_API bool "Enable kprobes-based dynamic events" select TRACING default y