---

yaml --- r: 1993 b: refs/heads/master c: 92c6dc5 h: refs/heads/master i: 1991: 5209190 v: v3
git-mirror · Jun 14, 2005 · 1da9ed8 · 1da9ed8
1 parent 98e6caf
commit 1da9ed8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -1222,14 +1222,14 @@ 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();
 	write_seqlock(&xtime_lock);
 	spin_lock(&i8253_lock);
 	reinit_timer();
 	set_time();
-	ignore_normal_resume = 1;
 
 	spin_unlock(&i8253_lock);
 	write_sequnlock(&xtime_lock);