From 32903a360e346e62bd7f57a6fff65ca9b375ce9f Mon Sep 17 00:00:00 2001
From: Huang Ying <ying.huang@intel.com>
Date: Fri, 15 Aug 2008 00:40:24 -0700
Subject: [PATCH] --- yaml --- r: 108472 b: refs/heads/master c:
 73bd9c72a29be1e8de008186eea55d333a938804 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 450879d55891..7f51649c4abc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca195b7f6da3d5dde0bb85a7c322d7de73352653
+refs/heads/master: 73bd9c72a29be1e8de008186eea55d333a938804
diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c
index b81682312dc4..17c80fdc453b 100644
--- a/trunk/kernel/kexec.c
+++ b/trunk/kernel/kexec.c
@@ -1457,6 +1457,7 @@ int kernel_kexec(void)
 		error = disable_nonboot_cpus();
 		if (error)
 			goto Resume_devices;
+		device_pm_lock();
 		local_irq_disable();
 		/* At this point, device_suspend() has been called,
 		 * but *not* device_power_down(). We *must*
@@ -1485,6 +1486,7 @@ int kernel_kexec(void)
 		device_power_up(PMSG_RESTORE);
  Enable_irqs:
 		local_irq_enable();
+		device_pm_unlock();
 		enable_nonboot_cpus();
  Resume_devices:
 		device_resume(PMSG_RESTORE);