From: Thomas Hood <jdthood@aglu.demon.nl>
Date: Tue, 14 Jun 2005 05:58:04 +0000 (-0700)
Subject: [PATCH] apm.c: ignore_normal_resume is set a bit too late
X-Git-Tag: accepted/tizen/common/20141203.182822~44552^2~54
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92c6dc59b7c1ca514021502c7eef53b9f2c738fd;p=platform%2Fkernel%2Flinux-arm64.git

[PATCH] apm.c: ignore_normal_resume is set a bit too late

This patch causes the ignore_normal_resume flag to be set slightly earlier,
before there is a chance that the apm driver will receive the normal resume
event from the BIOS.  (Addresses Debian bug #310865)

Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index 45641a8..0ff65ab 100644
--- a/arch/i386/kernel/apm.c
+++ b/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);