vserver 2.0 rc7

[linux-2.6.git] / arch / i386 / kernel / apm.c

diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index a005116..0ff65ab 100644 (file)
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -166,14 +166,14 @@
  *         If an APM idle fails log it and idle sensibly
  *   1.15: Don't queue events to clients who open the device O_WRONLY.
  *         Don't expect replies from clients who open the device O_RDONLY.
- *         (Idea from Thomas Hood <jdthood@mail.com>)
+ *         (Idea from Thomas Hood)
  *         Minor waitqueue cleanups. (John Fremlin <chief@bandits.org>)
  *   1.16: Fix idle calling. (Andreas Steinmetz <ast@domdv.de> et al.)
  *         Notify listeners of standby or suspend events before notifying
  *         drivers. Return EBUSY to ioctl() if suspend is rejected.
  *         (Russell King <rmk@arm.linux.org.uk> and Thomas Hood)
  *         Ignore first resume after we generate our own resume event
- *         after a suspend (Thomas Hood <jdthood@mail.com>)
+ *         after a suspend (Thomas Hood)
  *         Daemonize now gets rid of our controlling terminal (sfr).
  *         CONFIG_APM_CPU_IDLE now just affects the default value of
  *         idle_threshold (sfr).
@@ -1202,10 +1202,11 @@ static int suspend(int vetoable)
        }
 
        device_suspend(PMSG_SUSPEND);
+       local_irq_disable();
        device_power_down(PMSG_SUSPEND);
 
        /* serialize with the timer interrupt */
-       write_seqlock_irq(&xtime_lock);
+       write_seqlock(&xtime_lock);
 
        /* protect against access to timer chip registers */
        spin_lock(&i8253_lock);
@@ -1216,20 +1217,22 @@ static int suspend(int vetoable)
         * We'll undo any timer changes due to interrupts below.
         */
        spin_unlock(&i8253_lock);
-       write_sequnlock_irq(&xtime_lock);
+       write_sequnlock(&xtime_lock);
+       local_irq_enable();
 
        save_processor_state();
        err = set_system_power_state(APM_STATE_SUSPEND);
+       ignore_normal_resume = 1;
        restore_processor_state();
 
-       write_seqlock_irq(&xtime_lock);
+       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_irq(&xtime_lock);
+       write_sequnlock(&xtime_lock);
 
        if (err == APM_NO_ERROR)
                err = APM_SUCCESS;
@@ -1237,6 +1240,7 @@ static int suspend(int vetoable)
                apm_error("suspend", err);
        err = (err == APM_SUCCESS) ? 0 : -EIO;
        device_power_up();
+       local_irq_enable();
        device_resume();
        pm_send_all(PM_RESUME, (void *)0);
        queue_event(APM_NORMAL_RESUME, NULL);
@@ -1255,17 +1259,22 @@ static void standby(void)
 {
        int     err;
 
+       local_irq_disable();
        device_power_down(PMSG_SUSPEND);
        /* serialize with the timer interrupt */
-       write_seqlock_irq(&xtime_lock);
+       write_seqlock(&xtime_lock);
        /* If needed, notify drivers here */
        get_time_diff();
-       write_sequnlock_irq(&xtime_lock);
+       write_sequnlock(&xtime_lock);
+       local_irq_enable();
 
        err = set_system_power_state(APM_STATE_STANDBY);
        if ((err != APM_SUCCESS) && (err != APM_NO_ERROR))
                apm_error("standby", err);
+
+       local_irq_disable();
        device_power_up();
+       local_irq_enable();
 }
 
 static apm_event_t get_event(void)