lkml.org 
[lkml]   [2013]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH -tip v3 22/23] sched: Use NOKPROBE_SYMBOL macro in sched
    From
    Date
    Use NOKPROBE_SYMBOL macro to protect functions from
    kprobes instead of __kprobes annotation in sched/core.c.

    Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    ---
    kernel/sched/core.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/kernel/sched/core.c b/kernel/sched/core.c
    index 504fdbd..fece2e3 100644
    --- a/kernel/sched/core.c
    +++ b/kernel/sched/core.c
    @@ -2342,7 +2342,7 @@ notrace unsigned long get_parent_ip(unsigned long addr)
    #if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
    defined(CONFIG_PREEMPT_TRACER))

    -void __kprobes preempt_count_add(int val)
    +void preempt_count_add(int val)
    {
    #ifdef CONFIG_DEBUG_PREEMPT
    /*
    @@ -2363,8 +2363,9 @@ void __kprobes preempt_count_add(int val)
    trace_preempt_off(CALLER_ADDR0, get_parent_ip(CALLER_ADDR1));
    }
    EXPORT_SYMBOL(preempt_count_add);
    +NOKPROBE_SYMBOL(preempt_count_add);

    -void __kprobes preempt_count_sub(int val)
    +void preempt_count_sub(int val)
    {
    #ifdef CONFIG_DEBUG_PREEMPT
    /*
    @@ -2385,6 +2386,7 @@ void __kprobes preempt_count_sub(int val)
    __preempt_count_sub(val);
    }
    EXPORT_SYMBOL(preempt_count_sub);
    +NOKPROBE_SYMBOL(preempt_count_sub);

    #endif




    \
     
     \ /
      Last update: 2013-11-20 07:01    [W:4.754 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site