Skip to content

Commit 7f2a53c

Browse files
committed
rcu: Remove unused __rcu_is_watching() function
The x86/entry work removed all uses of __rcu_is_watching(), therefore this commit removes it entirely. Cc: Andy Lutomirski <luto@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: <x86@kernel.org> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
1 parent 666ca29 commit 7f2a53c

4 files changed

Lines changed: 1 addition & 8 deletions

File tree

include/linux/rcutiny.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ static inline void rcu_scheduler_starting(void) { }
103103
static inline void rcu_end_inkernel_boot(void) { }
104104
static inline bool rcu_inkernel_boot_has_ended(void) { return true; }
105105
static inline bool rcu_is_watching(void) { return true; }
106-
static inline bool __rcu_is_watching(void) { return true; }
107106
static inline void rcu_momentary_dyntick_idle(void) { }
108107
static inline void kfree_rcu_scheduler_running(void) { }
109108
static inline bool rcu_gp_might_be_stalled(void) { return false; }

include/linux/rcutree.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ extern int rcu_scheduler_active __read_mostly;
6464
void rcu_end_inkernel_boot(void);
6565
bool rcu_inkernel_boot_has_ended(void);
6666
bool rcu_is_watching(void);
67-
bool __rcu_is_watching(void);
6867
#ifndef CONFIG_PREEMPTION
6968
void rcu_all_qs(void);
7069
#endif

kernel/entry/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)
278278
* terminate a grace period, if and only if the timer interrupt is
279279
* not nested into another interrupt.
280280
*
281-
* Checking for __rcu_is_watching() here would prevent the nesting
281+
* Checking for rcu_is_watching() here would prevent the nesting
282282
* interrupt to invoke rcu_irq_enter(). If that nested interrupt is
283283
* the tick then rcu_flavor_sched_clock_irq() would wrongfully
284284
* assume that it is the first interupt and eventually claim

kernel/rcu/tree.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1077,11 +1077,6 @@ static void rcu_disable_urgency_upon_qs(struct rcu_data *rdp)
10771077
}
10781078
}
10791079

1080-
noinstr bool __rcu_is_watching(void)
1081-
{
1082-
return !rcu_dynticks_curr_cpu_in_eqs();
1083-
}
1084-
10851080
/**
10861081
* rcu_is_watching - see if RCU thinks that the current CPU is not idle
10871082
*

0 commit comments

Comments
 (0)