From 8e498248165ab969e95bb7eafab7297b7407b2b2 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 28 Mar 2012 08:44:07 +0200
Subject: [PATCH] --- yaml --- r: 298411 b: refs/heads/master c:
 9612090527526a15832480c48b1f4b39e93e8a35 h: refs/heads/master i:   298409:
 941d76b351e3035844b21361096d1ef9b07252f9   298407:
 107ea7673de57ead09df7f12972ea857fffc99ce v: v3

---
 [refs]                | 2 +-
 trunk/kernel/padata.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 66dc3d79167f..1f0d71587a4d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13614e0fb1a8840c134be35c179ff23e23676304
+refs/heads/master: 9612090527526a15832480c48b1f4b39e93e8a35
diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c
index de3d0d97800a..89fe3d1b9efb 100644
--- a/trunk/kernel/padata.c
+++ b/trunk/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;