diff options
author | Steffen Klassert <steffen.klassert@secunet.com> | 2012-03-28 02:44:07 -0400 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-03-29 07:52:46 -0400 |
commit | 9612090527526a15832480c48b1f4b39e93e8a35 (patch) | |
tree | d34a4459c33251ed9dbcb395eb41dce790b9b75e /kernel | |
parent | 13614e0fb1a8840c134be35c179ff23e23676304 (diff) |
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/padata.c | 3 |
1 files changed, 3 insertions, 0 deletions
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) | |||
748 | return -ENOMEM; | 748 | return -ENOMEM; |
749 | 749 | ||
750 | padata_replace(pinst, pd); | 750 | padata_replace(pinst, pd); |
751 | |||
752 | cpumask_clear_cpu(cpu, pd->cpumask.cbcpu); | ||
753 | cpumask_clear_cpu(cpu, pd->cpumask.pcpu); | ||
751 | } | 754 | } |
752 | 755 | ||
753 | return 0; | 756 | return 0; |