1 files changed, 7 insertions, 10 deletions

diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index abef759de7c8..c8c272df7154 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -14,7 +14,6 @@
 
 #include <linux/export.h>
 #include <linux/suspend.h>
-#include <linux/syscalls.h>
 #include <linux/reboot.h>
 #include <linux/string.h>
 #include <linux/device.h>
@@ -281,7 +280,7 @@ static int create_image(int platform_mode)
         if (error || hibernation_test(TEST_PLATFORM))
                 goto Platform_finish;
 
-        error = disable_nonboot_cpus();
+        error = suspend_disable_secondary_cpus();
         if (error || hibernation_test(TEST_CPUS))
                 goto Enable_cpus;
 
@@ -323,7 +322,7 @@ static int create_image(int platform_mode)
         local_irq_enable();
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Platform_finish:
         platform_finish(platform_mode);
@@ -417,7 +416,7 @@ int hibernation_snapshot(int platform_mode)
 
 int __weak hibernate_resume_nonboot_cpu_disable(void)
 {
-        return disable_nonboot_cpus();
+        return suspend_disable_secondary_cpus();
 }
 
 /**
@@ -486,7 +485,7 @@ static int resume_target_kernel(bool platform_mode)
         local_irq_enable();
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Cleanup:
         platform_restore_cleanup(platform_mode);
@@ -564,7 +563,7 @@ int hibernation_platform_enter(void)
         if (error)
                 goto Platform_finish;
 
-        error = disable_nonboot_cpus();
+        error = suspend_disable_secondary_cpus();
         if (error)
                 goto Enable_cpus;
 
@@ -586,7 +585,7 @@ int hibernation_platform_enter(void)
         local_irq_enable();
 
  Enable_cpus:
-        enable_nonboot_cpus();
+        suspend_enable_secondary_cpus();
 
  Platform_finish:
         hibernation_ops->finish();
@@ -709,9 +708,7 @@ int hibernate(void)
                 goto Exit;
         }
 
-        pr_info("Syncing filesystems ... \n");
-        ksys_sync();
-        pr_info("done.\n");
+        ksys_sync_helper();
 
         error = freeze_processes();
         if (error)