3 files changed, 3 insertions, 3 deletions

diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 917066a5767c..c14cd9991181 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -28,7 +28,7 @@ config PM_DEBUG
 
 config SOFTWARE_SUSPEND
         bool "Software Suspend"
-        depends on EXPERIMENTAL && PM && SWAP && ((X86 && SMP) || ((FVR || PPC32 || X86) && !SMP))
+        depends on PM && SWAP && (X86 || ((FVR || PPC32) && !SMP))
         ---help---
           Enable the possibility of suspending the machine.
           It doesn't need APM.
diff --git a/kernel/power/pm.c b/kernel/power/pm.c
index 61deda04e39e..159149321b3c 100644
--- a/kernel/power/pm.c
+++ b/kernel/power/pm.c
@@ -60,9 +60,8 @@ struct pm_dev *pm_register(pm_dev_t type,
                            unsigned long id,
                            pm_callback callback)
 {
-        struct pm_dev *dev = kmalloc(sizeof(struct pm_dev), GFP_KERNEL);
+        struct pm_dev *dev = kzalloc(sizeof(struct pm_dev), GFP_KERNEL);
         if (dev) {
-                memset(dev, 0, sizeof(*dev));
                 dev->type = type;
                 dev->id = id;
                 dev->callback = callback;
diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index eaacd5cb5889..d967e875ee82 100644
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -1059,6 +1059,7 @@ int swsusp_resume(void)
         BUG_ON(!error);
         restore_processor_state();
         restore_highmem();
+        touch_softlockup_watchdog();
         device_power_up();
         local_irq_enable();
         return error;