Commit 25c36329 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Move expediting-related access/control out of rcupdate.h 



The rcu_gp_is_normal(), rcu_gp_is_expedited(), rcu_expedite_gp(), and
rcu_unexpedite_gp() functions are intended only for use within the
RCU implementation itself -- the sysfs access is what should be used
outside of RCU.  This commit therefore moves the declarations for
these functions to kernel/rcu/rcu.h, and also includes this file into
kernel/rcu/rcutorture.c and kernel/rcu/rcuperf.c.  This also has the
beneficial effect of shrinking rcupdate.c a bit.

Reported-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 3caec62f

include/linux/rcupdate.h

+0 −26
Original line number Diff line number Diff line
@@ -46,32 +46,6 @@ 
#include <linux/ktime.h>

#include <linux/irqflags.h>



#ifdef CONFIG_TINY_RCU

/* Tiny RCU doesn't expedite, as its purpose in life is instead to be tiny. */

static inline bool rcu_gp_is_normal(void)  /* Internal RCU use. */

{

	return true;

}

static inline bool rcu_gp_is_expedited(void)  /* Internal RCU use. */

{

	return false;

}



static inline void rcu_expedite_gp(void)

{

}



static inline void rcu_unexpedite_gp(void)

{

}

#else /* #ifdef CONFIG_TINY_RCU */

bool rcu_gp_is_normal(void);     /* Internal RCU use. */

bool rcu_gp_is_expedited(void);  /* Internal RCU use. */

void rcu_expedite_gp(void);

void rcu_unexpedite_gp(void);

void rcupdate_announce_bootup_oddness(void);

#endif /* #else #ifdef CONFIG_TINY_RCU */



enum rcutorture_type {

	RCU_FLAVOR,

	RCU_BH_FLAVOR,

kernel/rcu/rcu.h

+26 −0
Original line number Diff line number Diff line
@@ -293,4 +293,30 @@ static inline void rcu_init_levelspread(int *levelspread, const int *levelcnt) 


#endif /* #if defined(SRCU) || !defined(TINY_RCU) */



#ifdef CONFIG_TINY_RCU

/* Tiny RCU doesn't expedite, as its purpose in life is instead to be tiny. */

static inline bool rcu_gp_is_normal(void)  /* Internal RCU use. */

{

	return true;

}

static inline bool rcu_gp_is_expedited(void)  /* Internal RCU use. */

{

	return false;

}



static inline void rcu_expedite_gp(void)

{

}



static inline void rcu_unexpedite_gp(void)

{

}

#else /* #ifdef CONFIG_TINY_RCU */

bool rcu_gp_is_normal(void);     /* Internal RCU use. */

bool rcu_gp_is_expedited(void);  /* Internal RCU use. */

void rcu_expedite_gp(void);

void rcu_unexpedite_gp(void);

void rcupdate_announce_bootup_oddness(void);

#endif /* #else #ifdef CONFIG_TINY_RCU */



#endif /* __LINUX_RCU_H */

kernel/rcu/rcuperf.c

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#include <linux/torture.h>

#include <linux/vmalloc.h>



#include "rcu.h"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.vnet.ibm.com>");

kernel/rcu/rcutorture.c

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ 
#include <linux/torture.h>

#include <linux/vmalloc.h>



#include "rcu.h"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com> and Josh Triplett <josh@joshtriplett.org>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE