Commit 9733e4f0 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcu: Make _batches_completed() functions return unsigned long 



Long ago, the various ->completed fields were of type long, but now are
unsigned long due to signed-integer-overflow concerns.  However, the
various _batches_completed() functions remained of type long, even though
their only purpose in life is to return the corresponding ->completed
field.  This patch cleans this up by changing these functions' return
types to unsigned long.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 79619cf5

include/linux/rcutiny.h

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static inline void rcu_virt_note_context_switch(int cpu) 
/*

 * Return the number of grace periods.

 */

static inline long rcu_batches_completed(void)

static inline unsigned long rcu_batches_completed(void)

{

	return 0;

}
@@ -102,7 +102,7 @@ static inline long rcu_batches_completed(void) 
/*

 * Return the number of bottom-half grace periods.

 */

static inline long rcu_batches_completed_bh(void)

static inline unsigned long rcu_batches_completed_bh(void)

{

	return 0;

}

include/linux/rcutree.h

+3 −3
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ void cond_synchronize_rcu(unsigned long oldstate); 


extern unsigned long rcutorture_testseq;

extern unsigned long rcutorture_vernum;

long rcu_batches_completed(void);

long rcu_batches_completed_bh(void);

long rcu_batches_completed_sched(void);

unsigned long rcu_batches_completed(void);

unsigned long rcu_batches_completed_bh(void);

unsigned long rcu_batches_completed_sched(void);

void show_rcu_gp_kthreads(void);



void rcu_force_quiescent_state(void);

kernel/rcu/tree.c

+2 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ static int rcu_pending(void); 
/*

 * Return the number of RCU-sched batches processed thus far for debug & stats.

 */

long rcu_batches_completed_sched(void)

unsigned long rcu_batches_completed_sched(void)

{

	return rcu_sched_state.completed;

}
@@ -326,7 +326,7 @@ EXPORT_SYMBOL_GPL(rcu_batches_completed_sched); 
/*

 * Return the number of RCU BH batches processed thus far for debug & stats.

 */

long rcu_batches_completed_bh(void)

unsigned long rcu_batches_completed_bh(void)

{

	return rcu_bh_state.completed;

}

kernel/rcu/tree.h

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ DECLARE_PER_CPU(char, rcu_cpu_has_work); 


/* Forward declarations for rcutree_plugin.h */

static void rcu_bootup_announce(void);

long rcu_batches_completed(void);

unsigned long rcu_batches_completed(void);

static void rcu_preempt_note_context_switch(void);

static int rcu_preempt_blocked_readers_cgp(struct rcu_node *rnp);

#ifdef CONFIG_HOTPLUG_CPU

kernel/rcu/tree_plugin.h

+3 −3
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void __init rcu_bootup_announce(void) 
 * Return the number of RCU-preempt batches processed thus far

 * for debug and statistics.

 */

static long rcu_batches_completed_preempt(void)

static unsigned long rcu_batches_completed_preempt(void)

{

	return rcu_preempt_state.completed;

}
@@ -126,7 +126,7 @@ EXPORT_SYMBOL_GPL(rcu_batches_completed_preempt); 
/*

 * Return the number of RCU batches processed thus far for debug & stats.

 */

long rcu_batches_completed(void)

unsigned long rcu_batches_completed(void)

{

	return rcu_batches_completed_preempt();

}
@@ -935,7 +935,7 @@ static void __init rcu_bootup_announce(void) 
/*

 * Return the number of RCU batches processed thus far for debug & stats.

 */

long rcu_batches_completed(void)

unsigned long rcu_batches_completed(void)

{

	return rcu_batches_completed_sched();

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE