Skip to contentSkip to conversation

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

PATCH In review OGAWA Hirofumi 2 participants 3 messages Dec 6, 2009 – Dec 7, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---

 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

arch/x86/lib/Makefile renamed from arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe +1 -1
diff -puN arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe 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
 
arch/x86/Kconfig.debug renamed from arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe +2 -2
diff -puN arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe 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

_

Signature · 1 line
OGAWA Hirofumi <[email protected]>
#1 lore raw

[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.

Cc Masami Hiramatsu <[email protected]>

LKML-Reference: <[email protected]>

---
 arch/x86/Kconfig.debug |    4 ++--
 arch/x86/lib/Makefile  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/x86/Kconfig.debug +2 -2
index 7d0b681..0e90929 100644
@@ -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
arch/x86/lib/Makefile +1 -1
index a2d6472..442b3b3 100644
@@ -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
 
Acked-by on v1 1/1
#2 lore raw
In reply to OGAWA Hirofumi
Quoted 5 lines · OGAWA Hirofumi

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

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

Quoted 35 lines

---

  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

arch/x86/lib/Makefile renamed from arch/x86/lib/Makefile~kconfig-decoder-only-for-kprobe +1 -1
@@ -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

arch/x86/Kconfig.debug renamed from arch/x86/Kconfig.debug~kconfig-decoder-only-for-kprobe +2 -2
@@ -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

_

Signature · 7 lines
Masami Hiramatsu

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

e-mail: [email protected]