This reverts commit dcd42591ebb8a25895b551a5297ea9c24414ba54. The only user was RCU/nocb.
Unified · Split
| @@ -192,8 +192,6 @@ extern int try_to_del_timer_sync(struct timer_list *timer); · 191 unmodified lines | |||
| 192 | 192 | ||
| 193 | #define del_singleshot_timer_sync(t) del_timer_sync(t) | 193 | #define del_singleshot_timer_sync(t) del_timer_sync(t) |
| 194 | 194 | ||
| 195 | extern bool timer_curr_running(struct timer_list *timer); | ||
| 196 | |||
| 197 | extern void init_timers(void); | 195 | extern void init_timers(void); |
| 198 | struct hrtimer; | 196 | struct hrtimer; |
| 199 | extern enum hrtimer_restart it_real_fn(struct hrtimer *); | 197 | extern enum hrtimer_restart it_real_fn(struct hrtimer *); |
| @@ -1237,20 +1237,6 @@ int try_to_del_timer_sync(struct timer_list *timer) · 1236 unmodified lines | |||
| 1237 | } | 1237 | } |
| 1238 | EXPORT_SYMBOL(try_to_del_timer_sync); | 1238 | EXPORT_SYMBOL(try_to_del_timer_sync); |
| 1239 | 1239 | ||
| 1240 | bool timer_curr_running(struct timer_list *timer) | ||
| 1241 | { | ||
| 1242 | int i; | ||
| 1243 | |||
| 1244 | for (i = 0; i < NR_BASES; i++) { | ||
| 1245 | struct timer_base *base = this_cpu_ptr(&timer_bases[i]); | ||
| 1246 | |||
| 1247 | if (base->running_timer == timer) | ||
| 1248 | return true; | ||
| 1249 | } | ||
| 1250 | |||
| 1251 | return false; | ||
| 1252 | } | ||
| 1253 | |||
| 1254 | #ifdef CONFIG_PREEMPT_RT | 1240 | #ifdef CONFIG_PREEMPT_RT |
| 1255 | static __init void timer_base_init_expiry_lock(struct timer_base *base) | 1241 | static __init void timer_base_init_expiry_lock(struct timer_base *base) |
| 1256 | { | 1242 | { |