ia64/xen-unstable

changeset 19242:edd7f612ebe0

x86: Relax spinlock checks during shutdown or S3.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sun Mar 01 14:35:57 2009 +0000 (2009-03-01)
parents 9af46734ce70
children 226031d62fc5
files xen/arch/x86/acpi/power.c xen/arch/x86/shutdown.c
line diff
     1.1 --- a/xen/arch/x86/acpi/power.c	Sun Mar 01 14:30:35 2009 +0000
     1.2 +++ b/xen/arch/x86/acpi/power.c	Sun Mar 01 14:35:57 2009 +0000
     1.3 @@ -175,6 +175,7 @@ static int enter_state(u32 state)
     1.4      printk("Entering ACPI S%d state.\n", state);
     1.5  
     1.6      local_irq_save(flags);
     1.7 +    spin_debug_disable();
     1.8  
     1.9      if ( (error = device_power_down()) )
    1.10      {
    1.11 @@ -208,6 +209,7 @@ static int enter_state(u32 state)
    1.12      printk(XENLOG_INFO "Finishing wakeup from ACPI S%d state.", state);
    1.13  
    1.14   done:
    1.15 +    spin_debug_enable();
    1.16      local_irq_restore(flags);
    1.17      console_end_sync();
    1.18      acpi_sleep_post(state);
     2.1 --- a/xen/arch/x86/shutdown.c	Sun Mar 01 14:30:35 2009 +0000
     2.2 +++ b/xen/arch/x86/shutdown.c	Sun Mar 01 14:35:57 2009 +0000
     2.3 @@ -302,6 +302,7 @@ void machine_restart(unsigned int delay_
     2.4  
     2.5      watchdog_disable();
     2.6      console_start_sync();
     2.7 +    spin_debug_disable();
     2.8  
     2.9      local_irq_enable();
    2.10