Cc: Ananth N Mavinakayanahalli <[email protected]> Cc: Anil S Keshavamurthy <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Masami Hiramatsu <[email protected]> Signed-off-by: Vegard Nossum <[email protected]> --- kernel/kprobes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index d630954..f163f74 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -31,6 +31,7 @@ * <[email protected]> and Prasanna S Panchamukhi * <[email protected]> added function-return probes. */ +#include <linux/extarray.h> #include <linux/kprobes.h> #include <linux/hash.h> #include <linux/init.h> @@ -2126,8 +2127,7 @@ static struct notifier_block kprobe_module_nb = { }; /* Markers of _kprobe_blacklist section */ -extern unsigned long __start_kprobe_blacklist[]; -extern unsigned long __stop_kprobe_blacklist[]; +DECLARE_EXTARRAY(unsigned long, kprobe_blacklist); static int __init init_kprobes(void) { @@ -2141,8 +2141,8 @@ static int __init init_kprobes(void) raw_spin_lock_init(&(kretprobe_table_locks[i].lock)); } - err = populate_kprobe_blacklist(__start_kprobe_blacklist, - __stop_kprobe_blacklist); + err = populate_kprobe_blacklist(ext_start(kprobe_blacklist), + ext_end(kprobe_blacklist)); if (err) { pr_err("kprobes: failed to populate blacklist: %d\n", err); pr_err("Please take care of using kprobes.\n"); -- 2.10.0.479.g221bd91
