[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-05ed160e89baf7f5fb3432d527fec467d2493626@git.kernel.org>
Date: Mon, 13 Sep 2010 19:54:47 GMT
From: tip-bot for Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
randy.dunlap@...cle.com, davem@...emloft.net,
anil.s.keshavamurthy@...el.com, ananth@...ibm.com,
masami.hiramatsu.pt@...achi.com, akpm@...ux-foundation.org,
tglx@...utronix.de, felipe.contreras@...il.com, mingo@...e.hu
Subject: [tip:perf/urgent] kprobes: Fix Kconfig dependency
Commit-ID: 05ed160e89baf7f5fb3432d527fec467d2493626
Gitweb: http://git.kernel.org/tip/05ed160e89baf7f5fb3432d527fec467d2493626
Author: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
AuthorDate: Mon, 13 Sep 2010 19:25:41 +0900
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Mon, 13 Sep 2010 20:41:31 +0200
kprobes: Fix Kconfig dependency
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 <masami.hiramatsu.pt@...achi.com>
Acked-by: Randy Dunlap <randy.dunlap@...cle.com>,
Cc: Ananth N Mavinakayanahalli <ananth@...ibm.com>
Cc: Felipe Contreras <felipe.contreras@...il.com>
Cc: Randy Dunlap <randy.dunlap@...cle.com>
Cc: Ananth N Mavinakayanahalli <ananth@...ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@...el.com>
Cc: David S. Miller <davem@...emloft.net>
Cc: akpm <akpm@...ux-foundation.org>
LKML-Reference: <20100913102541.20260.85700.stgit@...236.sdl.hitachi.co.jp>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists