Commit 08169a16 authored by Chen Yu's avatar Chen Yu Committed by Rafael J. Wysocki

PM: hibernate: Turn snapshot_test into global variable

There is need to check snapshot_test and open block device
in different mode, so as to avoid the race condition.

No functional changes intended.
Suggested-by: default avatarPavankumar Kondeti <quic_pkondeti@quicinc.com>
Signed-off-by: default avatarChen Yu <yu.c.chen@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0cfd8703
...@@ -64,6 +64,7 @@ enum { ...@@ -64,6 +64,7 @@ enum {
static int hibernation_mode = HIBERNATION_SHUTDOWN; static int hibernation_mode = HIBERNATION_SHUTDOWN;
bool freezer_test_done; bool freezer_test_done;
bool snapshot_test;
static const struct platform_hibernation_ops *hibernation_ops; static const struct platform_hibernation_ops *hibernation_ops;
...@@ -716,7 +717,6 @@ static int load_image_and_restore(void) ...@@ -716,7 +717,6 @@ static int load_image_and_restore(void)
*/ */
int hibernate(void) int hibernate(void)
{ {
bool snapshot_test = false;
unsigned int sleep_flags; unsigned int sleep_flags;
int error; int error;
...@@ -744,6 +744,9 @@ int hibernate(void) ...@@ -744,6 +744,9 @@ int hibernate(void)
if (error) if (error)
goto Exit; goto Exit;
/* protected by system_transition_mutex */
snapshot_test = false;
lock_device_hotplug(); lock_device_hotplug();
/* Allocate memory management structures */ /* Allocate memory management structures */
error = create_basic_memory_bitmaps(); error = create_basic_memory_bitmaps();
...@@ -940,6 +943,8 @@ static int software_resume(void) ...@@ -940,6 +943,8 @@ static int software_resume(void)
*/ */
mutex_lock_nested(&system_transition_mutex, SINGLE_DEPTH_NESTING); mutex_lock_nested(&system_transition_mutex, SINGLE_DEPTH_NESTING);
snapshot_test = false;
if (swsusp_resume_device) if (swsusp_resume_device)
goto Check_image; goto Check_image;
......
...@@ -59,6 +59,7 @@ asmlinkage int swsusp_save(void); ...@@ -59,6 +59,7 @@ asmlinkage int swsusp_save(void);
/* kernel/power/hibernate.c */ /* kernel/power/hibernate.c */
extern bool freezer_test_done; extern bool freezer_test_done;
extern bool snapshot_test;
extern int hibernation_snapshot(int platform_mode); extern int hibernation_snapshot(int platform_mode);
extern int hibernation_restore(int platform_mode); extern int hibernation_restore(int platform_mode);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment