X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fsmpboot.c;h=8eaed9aa9cf0c1995520605af1de8ef3b9e95485;hb=8edfdab37157d2683e51b8be5d3d5697f66a9f7b;hp=b9bde572782932f24d8a3a9f3a4f0670cb07b633;hpb=b0af9cd9aab60ceb17d3ebabb9fdf4ff0a99cf50;p=~andy%2Flinux

diff --git a/kernel/smpboot.c b/kernel/smpboot.c
index b9bde572782..8eaed9aa9cf 100644
--- a/kernel/smpboot.c
+++ b/kernel/smpboot.c
@@ -131,7 +131,7 @@ static int smpboot_thread_fn(void *data)
 			continue;
 		}
 
-		//BUG_ON(td->cpu != smp_processor_id());
+		BUG_ON(td->cpu != smp_processor_id());
 
 		/* Check for state change setup */
 		switch (td->status) {
@@ -209,6 +209,8 @@ static void smpboot_unpark_thread(struct smp_hotplug_thread *ht, unsigned int cp
 {
 	struct task_struct *tsk = *per_cpu_ptr(ht->store, cpu);
 
+	if (ht->pre_unpark)
+		ht->pre_unpark(cpu);
 	kthread_unpark(tsk);
 }