From 2fef02919f68cc0593b92f85f9d15a69b18cb79a Mon Sep 17 00:00:00 2001
From: Gregory Haskins <ghaskins@novell.com>
Date: Mon, 10 Mar 2008 17:59:11 -0400
Subject: [PATCH] --- yaml --- r: 87169 b: refs/heads/master c:
 08f503b0c089968b2542659a89dfd50c5c59bb0b h: refs/heads/master i:   87167:
 fdc36f69c240e2db80c0f07da386a53178bd4cd5 v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f1ccc1d74a72..e9df2ac148dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f94ef598e8d29b92b9fc85d43c832e03721d3cb
+refs/heads/master: 08f503b0c089968b2542659a89dfd50c5c59bb0b
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 52b98675acb2..1cb53fb1fe3d 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -5881,7 +5881,8 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
 		spin_unlock_irq(&rq->lock);
 		break;
 
-	case CPU_DOWN_PREPARE:
+	case CPU_DYING:
+	case CPU_DYING_FROZEN:
 		/* Update our root-domain */
 		rq = cpu_rq(cpu);
 		spin_lock_irqsave(&rq->lock, flags);