Hibernation: Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers (rev. 2)

Add PM_RESTORE_PREPARE and PM_POST_RESTORE notifiers to the PM core, to be used
in analogy with the existing PM_HIBERNATION_PREPARE and PM_POST_HIBERNATION
notifiers.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index b138b431e271..659736508239 100644
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -499,6 +499,10 @@ static int software_resume(void)
                 goto Unlock;
         }
 
+        error = pm_notifier_call_chain(PM_RESTORE_PREPARE);
+        if (error)
+                goto Finish;
+
         error = create_basic_memory_bitmaps();
         if (error)
                 goto Finish;
@@ -522,6 +526,7 @@ static int software_resume(void)
  Done:
         free_basic_memory_bitmaps();
  Finish:
+        pm_notifier_call_chain(PM_POST_RESTORE);
         atomic_inc(&snapshot_device_available);
         /* For success case, the suspend path will release the lock */
  Unlock: