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

rcu: Remove the unused rcu_irq_exit_preempt() function 



Commit 9ee01e0f ("x86/entry: Clean up idtentry_enter/exit()
leftovers") left the rcu_irq_exit_preempt() in place in order to avoid
conflicts with the -rcu tree.  Now that this change has long since hit
mainline, this commit removes the no-longer-used rcu_irq_exit_preempt()
function.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 4c9c3809

include/linux/rcutiny.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ static inline void rcu_irq_enter(void) { } 
static inline void rcu_irq_exit_irqson(void) { }

static inline void rcu_irq_enter_irqson(void) { }

static inline void rcu_irq_exit(void) { }

static inline void rcu_irq_exit_preempt(void) { }

static inline void rcu_irq_exit_check_preempt(void) { }

#define rcu_is_idle_cpu(cpu) \

	(is_idle_task(current) && !in_nmi() && !in_irq() && !in_serving_softirq())

include/linux/rcutree.h

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ void rcu_idle_enter(void); 
void rcu_idle_exit(void);

void rcu_irq_enter(void);

void rcu_irq_exit(void);

void rcu_irq_exit_preempt(void);

void rcu_irq_enter_irqson(void);

void rcu_irq_exit_irqson(void);

bool rcu_is_idle_cpu(int cpu);

kernel/rcu/tree.c

+0 −22
Original line number Diff line number Diff line
@@ -833,28 +833,6 @@ void noinstr rcu_irq_exit(void) 
	rcu_nmi_exit();

}



/**

 * rcu_irq_exit_preempt - Inform RCU that current CPU is exiting irq

 *			  towards in kernel preemption

 *

 * Same as rcu_irq_exit() but has a sanity check that scheduling is safe

 * from RCU point of view. Invoked from return from interrupt before kernel

 * preemption.

 */

void rcu_irq_exit_preempt(void)

{

	lockdep_assert_irqs_disabled();

	rcu_nmi_exit();



	RCU_LOCKDEP_WARN(__this_cpu_read(rcu_data.dynticks_nesting) <= 0,

			 "RCU dynticks_nesting counter underflow/zero!");

	RCU_LOCKDEP_WARN(__this_cpu_read(rcu_data.dynticks_nmi_nesting) !=

			 DYNTICK_IRQ_NONIDLE,

			 "Bad RCU  dynticks_nmi_nesting counter\n");

	RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(),

			 "RCU in extended quiescent state!");

}



#ifdef CONFIG_PROVE_RCU

/**

 * rcu_irq_exit_check_preempt - Validate that scheduling is possible