From dec0c450b0dd7d988c34485bd524290d2de76e85 Mon Sep 17 00:00:00 2001
From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Wed, 19 May 2010 13:45:35 +1000
Subject: [PATCH] --- yaml --- r: 196733 b: refs/heads/master c:
 3789ae7dcd29fa146b23dc30377925d1f73c8adf h: refs/heads/master i:   196731:
 c0bc445566302a4994e495438bceb466a5a21ee4 v: v3

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

diff --git a/[refs] b/[refs]
index fe2fad5b6a14..51b565538511 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0198ffd135f51d4fbb0c50036395716c06632ed9
+refs/heads/master: 3789ae7dcd29fa146b23dc30377925d1f73c8adf
diff --git a/trunk/kernel/padata.c b/trunk/kernel/padata.c
index ca89dfb69805..b1c9857f8402 100644
--- a/trunk/kernel/padata.c
+++ b/trunk/kernel/padata.c
@@ -763,7 +763,10 @@ void padata_free(struct padata_instance *pinst)
 #ifdef CONFIG_HOTPLUG_CPU
 	unregister_hotcpu_notifier(&pinst->cpu_notifier);
 #endif
+	get_online_cpus();
 	padata_flush_queues(pinst->pd);
+	put_online_cpus();
+
 	padata_free_pd(pinst->pd);
 	free_cpumask_var(pinst->cpumask);
 	kfree(pinst);