From 1da9ed8d9b49d8e7ab2c3c072f29f7d41dfec7fb Mon Sep 17 00:00:00 2001
From: Thomas Hood <jdthood@aglu.demon.nl>
Date: Mon, 13 Jun 2005 22:58:04 -0700
Subject: [PATCH] --- yaml --- r: 1993 b: refs/heads/master c:
 92c6dc59b7c1ca514021502c7eef53b9f2c738fd h: refs/heads/master i:   1991:
 5209190f1638384f0af0a206b7f147e13cc745e9 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/i386/kernel/apm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1ac1d4e3faba..d09771f357ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 223230e78900e5f0be984f7697cb9bf172d71a35
+refs/heads/master: 92c6dc59b7c1ca514021502c7eef53b9f2c738fd
diff --git a/trunk/arch/i386/kernel/apm.c b/trunk/arch/i386/kernel/apm.c
index 45641a872550..0ff65abcd56c 100644
--- a/trunk/arch/i386/kernel/apm.c
+++ b/trunk/arch/i386/kernel/apm.c
@@ -1222,6 +1222,7 @@ static int suspend(int vetoable)
 
 	save_processor_state();
 	err = set_system_power_state(APM_STATE_SUSPEND);
+	ignore_normal_resume = 1;
 	restore_processor_state();
 
 	local_irq_disable();
@@ -1229,7 +1230,6 @@ static int suspend(int vetoable)
 	spin_lock(&i8253_lock);
 	reinit_timer();
 	set_time();
-	ignore_normal_resume = 1;
 
 	spin_unlock(&i8253_lock);
 	write_sequnlock(&xtime_lock);