lkml.org 
[lkml]   [2016]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/12] kprobes: declare __{start,stop}_kprobe_blacklist as external array
    Date
    Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
    Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
    ---
    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 @@
    * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
    * <prasanna@in.ibm.com> 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
    \
     
     \ /
      Last update: 2016-10-16 17:19    [W:12.042 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site