From 1395245378f7395a061e537aca9a2b4be5dc943d Mon Sep 17 00:00:00 2001
From: Shaohua Li <shaohua.li@intel.com>
Date: Tue, 19 May 2009 16:09:54 +0800
Subject: [PATCH] --- yaml --- r: 145418 b: refs/heads/master c:
 7d60e8ab0d5507229dfbdf456501cc378610fa01 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/processor_idle.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 235da2961e32..a28e0275a962 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87ad57bacb25c3f24c54f142ef445f68277705f0
+refs/heads/master: 7d60e8ab0d5507229dfbdf456501cc378610fa01
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index 6b7bcc7e3e1d..10a2d913635a 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -834,8 +834,8 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev,
 
 	/* Do not access any ACPI IO ports in suspend path */
 	if (acpi_idle_suspend) {
-		acpi_safe_halt();
 		local_irq_enable();
+		cpu_relax();
 		return 0;
 	}