diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2020-09-22 13:15:19 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2020-09-22 13:15:42 +0300 |
| commit | b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248 (patch) | |
| tree | 22a68caea35b25309595167acc387c491d934d24 /kernel | |
| parent | ba4f184e126b751d1bffad5897f263108befc780 (diff) | |
| parent | 98477740630f270aecf648f1d6a9dbc6027d4ff1 (diff) | |
Merge remote-tracking branch 'origin/master' into drm-intel-fixes
Direct backmerge to get commit 88b67edd7247 ("dax: Fix compilation for
CONFIG_DAX && !CONFIG_FS_DAX") to fix CI build issues.
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/rcu/tasks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/rcu/tasks.h b/kernel/rcu/tasks.h index 835e2df8590a..05d3e1375e4c 100644 --- a/kernel/rcu/tasks.h +++ b/kernel/rcu/tasks.h @@ -590,7 +590,7 @@ void exit_tasks_rcu_finish(void) __releases(&tasks_rcu_exit_srcu) } #else /* #ifdef CONFIG_TASKS_RCU */ -static void show_rcu_tasks_classic_gp_kthread(void) { } +static inline void show_rcu_tasks_classic_gp_kthread(void) { } void exit_tasks_rcu_start(void) { } void exit_tasks_rcu_finish(void) { exit_tasks_rcu_finish_trace(current); } #endif /* #else #ifdef CONFIG_TASKS_RCU */ |