Subject: [PATCH -next,-tip ] kprobes: Fix Kconfig dependency

From: Masami Hiramatsu <[email-masked]>
Date: Mon, 13 Sep 2010 19:25:41 +0900

Fix Kconfig dependency among Kprobes, optprobe and kallsyms.

Kprobes uses kallsyms_lookup for finding target function and checking
instruction boundary, thus CONFIG_KPROBES should select CONFIG_KALLSYMS.

Optprobe is an optional feature which is supported on x86 arch, and
it also uses kallsyms_lookup for checking instructions in the target
function. Since KALLSYMS_ALL just adds symbols of kernel variables,
it doesn't need to select KALLSYMS_ALL.

Signed-off-by: Masami Hiramatsu <[email-masked]>
Cc: Felipe Contreras <[email-masked]>
Cc: Randy Dunlap <[email-masked]>,
Cc: [email-masked],
Cc: [email-masked],
Cc: Ananth N Mavinakayanahalli <[email-masked]>,
Cc: Anil S Keshavamurthy <[email-masked]>,
Cc: "David S. Miller" <[email-masked]>,
Cc: akpm <[email-masked]>
---

 arch/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/Kconfig b/arch/Kconfig
index 4877a8c..fe48fc7 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -32,8 +32,9 @@ config HAVE_OPROFILE
 
 config KPROBES
 	bool "Kprobes"
-	depends on KALLSYMS && MODULES
+	depends on MODULES
 	depends on HAVE_KPROBES
+	select KALLSYMS
 	help
 	  Kprobes allows you to trap at almost any kernel address and
 	  execute a callback function.  register_kprobe() establishes
@@ -45,7 +46,6 @@ config OPTPROBES
 	def_bool y
 	depends on KPROBES && HAVE_OPTPROBES
 	depends on !PREEMPT
-	select KALLSYMS_ALL
 
 config HAVE_EFFICIENT_UNALIGNED_ACCESS
 	bool