diff --git a/kernel/padata.c b/kernel/padata.c
index fdcd78302cd72ec4d7f51160bc45403a119706f4..86ccae9961430e88b970e55a218c9cae4b7f19f5 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -1112,6 +1112,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);