lkml.org 
[lkml]   [2017]   [May]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 77/88] rcu: Remove #ifdef moving rcu_end_inkernel_boot from rcupdate.h
    Date
    This commit removes a #ifdef and saves a few lines of code by moving
    the rcu_end_inkernel_boot() function from include/linux/rcupdate.h to
    include/linux/rcutiny.h (for TINY_RCU) and to include/linux/rcutree.h
    (for TREE_RCU).

    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    include/linux/rcupdate.h | 6 ------
    include/linux/rcutiny.h | 2 +-
    include/linux/rcutree.h | 1 +
    3 files changed, 2 insertions(+), 7 deletions(-)

    diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
    index 7f24a5e673f5..f816fc72b51e 100644
    --- a/include/linux/rcupdate.h
    +++ b/include/linux/rcupdate.h
    @@ -111,12 +111,6 @@ void rcu_check_callbacks(int user);
    void rcu_report_dead(unsigned int cpu);
    void rcu_cpu_starting(unsigned int cpu);

    -#ifndef CONFIG_TINY_RCU
    -void rcu_end_inkernel_boot(void);
    -#else /* #ifndef CONFIG_TINY_RCU */
    -static inline void rcu_end_inkernel_boot(void) { }
    -#endif /* #ifndef CONFIG_TINY_RCU */
    -
    #ifdef CONFIG_RCU_STALL_COMMON
    void rcu_sysrq_start(void);
    void rcu_sysrq_end(void);
    diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h
    index c869785f16bd..5becbbccb998 100644
    --- a/include/linux/rcutiny.h
    +++ b/include/linux/rcutiny.h
    @@ -123,7 +123,7 @@ void rcu_scheduler_starting(void);
    #else /* #if defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_SRCU) */
    static inline void rcu_scheduler_starting(void) { }
    #endif /* #else #if defined(CONFIG_DEBUG_LOCK_ALLOC) || defined(CONFIG_SRCU) */
    -
    +static inline void rcu_end_inkernel_boot(void) { }
    static inline bool rcu_is_watching(void) { return true; }

    /* Avoid RCU read-side critical sections leaking across. */
    diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
    index d6aa89d15d47..37d6fd3b7ff8 100644
    --- a/include/linux/rcutree.h
    +++ b/include/linux/rcutree.h
    @@ -91,6 +91,7 @@ void exit_rcu(void);

    void rcu_scheduler_starting(void);
    extern int rcu_scheduler_active __read_mostly;
    +void rcu_end_inkernel_boot(void);
    bool rcu_is_watching(void);
    void rcu_all_qs(void);

    --
    2.5.2
    \
     
     \ /
      Last update: 2017-05-26 00:04    [W:4.259 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site