2009-12-06 11:14:28

by OGAWA Hirofumi

Subject: [PATCH] x86: compile insn.c and inat.c only for KPROBES

At least, insn.c and inat.c is needed for kprobe for now. So, this
compile those only if KPROBES is enabled.

Signed-off-by: OGAWA Hirofumi <[email protected]>
---

arch/x86/Kconfig.debug | 4 ++--
arch/x86/lib/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff -L arch/x86/lib/Kconfig -puN /dev/null /dev/null
diff -puN arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe arch/x86/lib/Makefile
--- linux-2.6/arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe 2009-12-06 19:49:06.000000000 +0900
+++ linux-2.6-hirofumi/arch/x86/lib/Makefile 2009-12-06 19:49:06.000000000 +0900
@@ -20,7 +20,7 @@ lib-y := delay.o
lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o getuser.o putuser.o
lib-y += memcpy_$(BITS).o
-lib-y += insn.o inat.o
+lib-$(CONFIG_KPROBES) += insn.o inat.o

obj-y += msr-reg.o msr-reg-export.o

diff -puN arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe arch/x86/Kconfig.debug
--- linux-2.6/arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe 2009-12-06 19:49:06.000000000 +0900
+++ linux-2.6-hirofumi/arch/x86/Kconfig.debug 2009-12-06 19:49:06.000000000 +0900
@@ -187,8 +187,8 @@ config HAVE_MMIOTRACE_SUPPORT
def_bool y

config X86_DECODER_SELFTEST
- bool "x86 instruction decoder selftest"
- depends on DEBUG_KERNEL
+ bool "x86 instruction decoder selftest"
+ depends on DEBUG_KERNEL && KPROBES
---help---
Perform x86 instruction decoder selftests at build time.
This option is useful for checking the sanity of x86 instruction
_

--
OGAWA Hirofumi <[email protected]>

2009-12-07 08:16:15

by OGAWA Hirofumi

Subject: [tip:perf/urgent] x86: Compile insn.c and inat.c only for KPROBES

Commit-ID: cbe5c34c8c1f8ed1afbe6273f4ad57fcfad7822f
Gitweb: http://git.kernel.org/tip/cbe5c34c8c1f8ed1afbe6273f4ad57fcfad7822f
Author: OGAWA Hirofumi <[email protected]>
AuthorDate: Sun, 6 Dec 2009 20:14:29 +0900
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 7 Dec 2009 08:31:28 +0100

x86: Compile insn.c and inat.c only for KPROBES

At least, insn.c and inat.c is needed for kprobe for now. So,
this compile those only if KPROBES is enabled.

Signed-off-by: OGAWA Hirofumi <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/Kconfig.debug | 4 ++--
arch/x86/lib/Makefile | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 7d0b681..0e90929 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -187,8 +187,8 @@ config HAVE_MMIOTRACE_SUPPORT
def_bool y

config X86_DECODER_SELFTEST
- bool "x86 instruction decoder selftest"
- depends on DEBUG_KERNEL
+ bool "x86 instruction decoder selftest"
+ depends on DEBUG_KERNEL && KPROBES
---help---
Perform x86 instruction decoder selftests at build time.
This option is useful for checking the sanity of x86 instruction
diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index a2d6472..442b3b3 100644
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -20,7 +20,7 @@ lib-y := delay.o
lib-y += thunk_$(BITS).o
lib-y += usercopy_$(BITS).o getuser.o putuser.o
lib-y += memcpy_$(BITS).o
-lib-y += insn.o inat.o
+lib-$(CONFIG_KPROBES) += insn.o inat.o

obj-y += msr-reg.o msr-reg-export.o

2009-12-07 14:28:57

by Masami Hiramatsu

Subject: Re: [PATCH] x86: compile insn.c and inat.c only for KPROBES

OGAWA Hirofumi wrote:
>
> At least, insn.c and inat.c is needed for kprobe for now. So, this
> compile those only if KPROBES is enabled.
>
> Signed-off-by: OGAWA Hirofumi<[email protected]>

Right, currently, the decoder is only used by kprobes.
Thank you,

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

> ---
>
> arch/x86/Kconfig.debug | 4 ++--
> arch/x86/lib/Makefile | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff -L arch/x86/lib/Kconfig -puN /dev/null /dev/null
> diff -puN arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe arch/x86/lib/Makefile
> --- linux-2.6/arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe 2009-12-06 19:49:06.000000000 +0900
> +++ linux-2.6-hirofumi/arch/x86/lib/Makefile 2009-12-06 19:49:06.000000000 +0900
> @@ -20,7 +20,7 @@ lib-y := delay.o
> lib-y += thunk_$(BITS).o
> lib-y += usercopy_$(BITS).o getuser.o putuser.o
> lib-y += memcpy_$(BITS).o
> -lib-y += insn.o inat.o
> +lib-$(CONFIG_KPROBES) += insn.o inat.o
>
> obj-y += msr-reg.o msr-reg-export.o
>
> diff -puN arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe arch/x86/Kconfig.debug
> --- linux-2.6/arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe 2009-12-06 19:49:06.000000000 +0900
> +++ linux-2.6-hirofumi/arch/x86/Kconfig.debug 2009-12-06 19:49:06.000000000 +0900
> @@ -187,8 +187,8 @@ config HAVE_MMIOTRACE_SUPPORT
> def_bool y
>
> config X86_DECODER_SELFTEST
> - bool "x86 instruction decoder selftest"
> - depends on DEBUG_KERNEL
> + bool "x86 instruction decoder selftest"
> + depends on DEBUG_KERNEL&& KPROBES
> ---help---
> Perform x86 instruction decoder selftests at build time.
> This option is useful for checking the sanity of x86 instruction
> _
>

--
Masami Hiramatsu

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

e-mail: [email protected]