1 files changed, 6 insertions, 5 deletions

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a790ef4be74e..3674e42e3620 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -155,16 +155,17 @@ static inline void set_pcppage_migratetype(struct page *page, int migratetype)
  * The following functions are used by the suspend/hibernate code to temporarily
  * change gfp_allowed_mask in order to avoid using I/O during memory allocations
  * while devices are suspended.  To avoid races with the suspend/hibernate code,
- * they should always be called with pm_mutex held (gfp_allowed_mask also should
- * only be modified with pm_mutex held, unless the suspend/hibernate code is
- * guaranteed not to run in parallel with that modification).
+ * they should always be called with system_transition_mutex held
+ * (gfp_allowed_mask also should only be modified with system_transition_mutex
+ * held, unless the suspend/hibernate code is guaranteed not to run in parallel
+ * with that modification).
  */
 
 static gfp_t saved_gfp_mask;
 
 void pm_restore_gfp_mask(void)
 {
-        WARN_ON(!mutex_is_locked(&pm_mutex));
+        WARN_ON(!mutex_is_locked(&system_transition_mutex));
         if (saved_gfp_mask) {
                 gfp_allowed_mask = saved_gfp_mask;
                 saved_gfp_mask = 0;
@@ -173,7 +174,7 @@ void pm_restore_gfp_mask(void)
 
 void pm_restrict_gfp_mask(void)
 {
-        WARN_ON(!mutex_is_locked(&pm_mutex));
+        WARN_ON(!mutex_is_locked(&system_transition_mutex));
         WARN_ON(saved_gfp_mask);
         saved_gfp_mask = gfp_allowed_mask;
         gfp_allowed_mask &= ~(__GFP_IO | __GFP_FS);