From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 28 Mar 2012 06:44:07 +0000 (+0200)
Subject: padata: Fix cpu hotplug
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9612090527526a15832480c48b1f4b39e93e8a35;p=linux-beck.git

padata: Fix cpu hotplug

We don't remove the cpu that went offline from our cpumasks
on cpu hotplug. This got lost somewhere along the line, so
restore it. This fixes a hang of the padata instance on cpu
hotplug.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/kernel/padata.c b/kernel/padata.c
index de3d0d97800a..89fe3d1b9efb 100644
--- a/kernel/padata.c
+++ b/kernel/padata.c
@@ -748,6 +748,9 @@ static int __padata_remove_cpu(struct padata_instance *pinst, int cpu)
 			return -ENOMEM;
 
 		padata_replace(pinst, pd);
+
+		cpumask_clear_cpu(cpu, pd->cpumask.cbcpu);
+		cpumask_clear_cpu(cpu, pd->cpumask.pcpu);
 	}
 
 	return 0;