summaryrefslogtreecommitdiffstats
path: root/kernel/module.c
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.com>2018-06-20 12:22:22 -0400
committerGustavo Padovan <gustavo.padovan@collabora.com>2018-06-20 12:22:22 -0400
commitd98c71dadc2d0debdb80beb5a478baf1e6f98758 (patch)
treebf873c28d3acced1814f8b2dba4ae69d2ed77333 /kernel/module.c
parentd67b6a2065076d763c7df626b8c54f16038ad862 (diff)
parentdaf0678c2036c918f01e4aa6035629d2debc2f30 (diff)
Merge drm-upstream/drm-next into drm-misc-next
We got a few conflicts in drm_atomic.c after merging the DRM writeback support, now we need a backmerge to unlock develop development on drm-misc-next. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.com>
Diffstat (limited to 'kernel/module.c')
-rw-r--r--kernel/module.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/kernel/module.c b/kernel/module.c
index ce8066b88178..c9bea7f2b43e 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3517,6 +3517,11 @@ static noinline int do_init_module(struct module *mod)
3517 * walking this with preempt disabled. In all the failure paths, we 3517 * walking this with preempt disabled. In all the failure paths, we
3518 * call synchronize_sched(), but we don't want to slow down the success 3518 * call synchronize_sched(), but we don't want to slow down the success
3519 * path, so use actual RCU here. 3519 * path, so use actual RCU here.
3520 * Note that module_alloc() on most architectures creates W+X page
3521 * mappings which won't be cleaned up until do_free_init() runs. Any
3522 * code such as mark_rodata_ro() which depends on those mappings to
3523 * be cleaned up needs to sync with the queued work - ie
3524 * rcu_barrier_sched()
3520 */ 3525 */
3521 call_rcu_sched(&freeinit->rcu, do_free_init); 3526 call_rcu_sched(&freeinit->rcu, do_free_init);
3522 mutex_unlock(&module_mutex); 3527 mutex_unlock(&module_mutex);