diff --git a/kernel/padata.c b/kernel/padata.c
index 427f28db6b25..85ac7cfe8744 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -1118,6 +1118,12 @@ void padata_free_shell(struct padata_shell *ps)
 	if (!ps)
 		return;
 
+	/*
+	 * Wait for all _do_serial calls to finish to avoid touching
+	 * freed pd's and ps's.
+	 */
+	synchronize_rcu();
+
 	mutex_lock(&ps->pinst->lock);
 	list_del(&ps->list);
 	pd = rcu_dereference_protected(ps->pd, 1);