lkml.org 
[lkml]   [2014]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 02/17] rcu: Handle obsolete references to TINY_PREEMPT_RCU
    Date
    From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>

    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    ---
    include/linux/rcupdate.h | 17 ++++++++---------
    init/Kconfig | 2 +-
    2 files changed, 9 insertions(+), 10 deletions(-)

    diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
    index c56ad15204ec..d231aa17b1d7 100644
    --- a/include/linux/rcupdate.h
    +++ b/include/linux/rcupdate.h
    @@ -826,15 +826,14 @@ static inline void rcu_preempt_sleep_check(void)
    * read-side critical section that would block in a !PREEMPT kernel.
    * But if you want the full story, read on!
    *
    - * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU), it
    - * is illegal to block while in an RCU read-side critical section. In
    - * preemptible RCU implementations (TREE_PREEMPT_RCU and TINY_PREEMPT_RCU)
    - * in CONFIG_PREEMPT kernel builds, RCU read-side critical sections may
    - * be preempted, but explicit blocking is illegal. Finally, in preemptible
    - * RCU implementations in real-time (with -rt patchset) kernel builds,
    - * RCU read-side critical sections may be preempted and they may also
    - * block, but only when acquiring spinlocks that are subject to priority
    - * inheritance.
    + * In non-preemptible RCU implementations (TREE_RCU and TINY_RCU),
    + * it is illegal to block while in an RCU read-side critical section.
    + * In preemptible RCU implementations (TREE_PREEMPT_RCU) in CONFIG_PREEMPT
    + * kernel builds, RCU read-side critical sections may be preempted,
    + * but explicit blocking is illegal. Finally, in preemptible RCU
    + * implementations in real-time (with -rt patchset) kernel builds, RCU
    + * read-side critical sections may be preempted and they may also block, but
    + * only when acquiring spinlocks that are subject to priority inheritance.
    */
    static inline void rcu_read_lock(void)
    {
    diff --git a/init/Kconfig b/init/Kconfig
    index 9d76b99af1b9..977b37806e95 100644
    --- a/init/Kconfig
    +++ b/init/Kconfig
    @@ -505,7 +505,7 @@ config PREEMPT_RCU
    def_bool TREE_PREEMPT_RCU
    help
    This option enables preemptible-RCU code that is common between
    - the TREE_PREEMPT_RCU and TINY_PREEMPT_RCU implementations.
    + TREE_PREEMPT_RCU and, in the old days, TINY_PREEMPT_RCU.

    config RCU_STALL_COMMON
    def_bool ( TREE_RCU || TREE_PREEMPT_RCU || RCU_TRACE )
    --
    1.8.1.5


    \
     
     \ /
      Last update: 2014-07-08 01:21    [W:4.421 / U:0.608 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site