Skip to content

Commit 9847774

Browse files
committed
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu
Pull RCU fix from Paul McKenney: "This contains a single commit that fixes a bug that was introduced in the last merge window. This bug causes a compiler warning complaining about show_rcu_tasks_classic_gp_kthread() being an unused static function in !SMP kernels. The fix is straightforward, just adding an 'inline' to make this a static inline function, thus avoiding the warning. This bug was reported by Laurent Pinchart, who would like it fixed sooner rather than later" * 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu: rcu-tasks: Prevent complaints of unused show_rcu_tasks_classic_gp_kthread()
2 parents beaeb4f + 78edc00 commit 9847774

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/rcu/tasks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ void exit_tasks_rcu_finish(void) __releases(&tasks_rcu_exit_srcu)
590590
}
591591

592592
#else /* #ifdef CONFIG_TASKS_RCU */
593-
static void show_rcu_tasks_classic_gp_kthread(void) { }
593+
static inline void show_rcu_tasks_classic_gp_kthread(void) { }
594594
void exit_tasks_rcu_start(void) { }
595595
void exit_tasks_rcu_finish(void) { exit_tasks_rcu_finish_trace(current); }
596596
#endif /* #else #ifdef CONFIG_TASKS_RCU */

0 commit comments

Comments
 (0)