2010-02-10 16:25:20

by Heiko Carstens

Subject: [PATCH 1/2] tracing/kprobes: make Kconfig dependencies generic

From: Heiko Carstens <[email protected]>

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 <[email protected]>
---
arch/Kconfig | 3 +++
arch/x86/Kconfig | 1 +
kernel/trace/Kconfig | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)

--- a/arch/Kconfig
+++ b/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
--- a/arch/x86/Kconfig
+++ b/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
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -449,7 +449,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

2010-02-11 00:12:00

by Masami Hiramatsu

Subject: Re: [PATCH 1/2] tracing/kprobes: make Kconfig dependencies generic

Heiko Carstens wrote:
> From: Heiko Carstens <[email protected]>
>
> 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.

Looks good to me:) Thanks!

Acked-by: Masami Hiramatsu <[email protected]>

>
> Signed-off-by: Heiko Carstens <[email protected]>
> ---
> arch/Kconfig | 3 +++
> arch/x86/Kconfig | 1 +
> kernel/trace/Kconfig | 2 +-
> 3 files changed, 5 insertions(+), 1 deletion(-)
>
> --- a/arch/Kconfig
> +++ b/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
> --- a/arch/x86/Kconfig
> +++ b/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
> --- a/kernel/trace/Kconfig
> +++ b/kernel/trace/Kconfig
> @@ -449,7 +449,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
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/

--
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America), Inc.
Software Solutions Division

e-mail: [email protected]

2010-02-14 17:32:19

by Frederic Weisbecker

Subject: Re: [PATCH 1/2] tracing/kprobes: make Kconfig dependencies generic

On Wed, Feb 10, 2010 at 07:11:35PM -0500, Masami Hiramatsu wrote:
> Heiko Carstens wrote:
> > From: Heiko Carstens <[email protected]>
> >
> > 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.
>
> Looks good to me:) Thanks!
>
> Acked-by: Masami Hiramatsu <[email protected]>


Queued both, thanks!

2010-02-27 12:52:34

by Heiko Carstens

Subject: [tip:tracing/core] tracing/kprobes: Make Kconfig dependencies generic

Commit-ID: f850c30c8b426ba1688cb63b1a3e534eed03a138
Gitweb: http://git.kernel.org/tip/f850c30c8b426ba1688cb63b1a3e534eed03a138
Author: Heiko Carstens <[email protected]>
AuthorDate: Wed, 10 Feb 2010 17:25:17 +0100
Committer: Frederic Weisbecker <[email protected]>
CommitDate: Wed, 17 Feb 2010 13:13:08 +0100

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 <[email protected]>
Acked-by: Masami Hiramatsu <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Martin Schwidefsky <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Frederic Weisbecker <[email protected]>
---
arch/Kconfig | 3 +++
arch/x86/Kconfig | 1 +
kernel/trace/Kconfig | 2 +-
3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index 9d055b4..04e3aa7 100644
--- a/arch/Kconfig
+++ b/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/arch/x86/Kconfig b/arch/x86/Kconfig
index 55298e8..07baa12 100644
--- a/arch/x86/Kconfig
+++ b/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/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 6c22d8a..40fef55 100644
--- a/kernel/trace/Kconfig
+++ b/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