lkml.org 
[lkml]   [2020]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC 1/3] Revert "tracepoint: Use __idx instead of idx in DO_TRACE macro to make it unique"
    Date
    This reverts commit 0c7a52e4d4b5c4d35b31f3c3ad32af814f1bf491.

    Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
    ---
    include/linux/tracepoint.h | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
    index 1fb11daa5c533..59463c90fdc3d 100644
    --- a/include/linux/tracepoint.h
    +++ b/include/linux/tracepoint.h
    @@ -164,7 +164,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
    struct tracepoint_func *it_func_ptr; \
    void *it_func; \
    void *__data; \
    - int __maybe_unused __idx = 0; \
    + int __maybe_unused idx = 0; \
    \
    if (!(cond)) \
    return; \
    @@ -180,7 +180,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
    * doesn't work from the idle path. \
    */ \
    if (rcuidle) { \
    - __idx = srcu_read_lock_notrace(&tracepoint_srcu);\
    + idx = srcu_read_lock_notrace(&tracepoint_srcu); \
    rcu_irq_enter_irqson(); \
    } \
    \
    @@ -196,7 +196,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p)
    \
    if (rcuidle) { \
    rcu_irq_exit_irqson(); \
    - srcu_read_unlock_notrace(&tracepoint_srcu, __idx);\
    + srcu_read_unlock_notrace(&tracepoint_srcu, idx);\
    } \
    \
    preempt_enable_notrace(); \
    --
    2.25.0.341.g760bfbb309-goog
    \
     
     \ /
      Last update: 2020-02-07 21:58    [W:3.844 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site