libata: separate ATA_EHI_DID_RESET into DID_SOFTRESET and DID_HARDRESET

[powerpc.git] / kernel / power / main.c

diff --git a/kernel/power/main.c b/kernel/power/main.c
index e1c4131..3062e94 100644 (file)
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -111,13 +111,24 @@ static int suspend_prepare(suspend_state_t state)
        return error;
 }
 
+/* default implementation */
+void __attribute__ ((weak)) arch_suspend_disable_irqs(void)
+{
+       local_irq_disable();
+}
+
+/* default implementation */
+void __attribute__ ((weak)) arch_suspend_enable_irqs(void)
+{
+       local_irq_enable();
+}
 
 int suspend_enter(suspend_state_t state)
 {
        int error = 0;
-       unsigned long flags;
 
-       local_irq_save(flags);
+       arch_suspend_disable_irqs();
+       BUG_ON(!irqs_disabled());
 
        if ((error = device_power_down(PMSG_SUSPEND))) {
                printk(KERN_ERR "Some devices failed to power down\n");
@@ -126,7 +137,8 @@ int suspend_enter(suspend_state_t state)
        error = pm_ops->enter(state);
        device_power_up();
  Done:
-       local_irq_restore(flags);
+       arch_suspend_enable_irqs();
+       BUG_ON(irqs_disabled());
        return error;
 }
 
@@ -167,7 +179,10 @@ static inline int valid_state(suspend_state_t state)
        if (state == PM_SUSPEND_DISK)
                return 1;
 
-       if (pm_ops && pm_ops->valid && !pm_ops->valid(state))
+       /* all other states need lowlevel support and need to be
+        * valid to the lowlevel implementation, no valid callback
+        * implies that all are valid. */
+       if (!pm_ops || (pm_ops->valid && !pm_ops->valid(state)))
                return 0;
        return 1;
 }