1 files changed, 6 insertions, 5 deletions

diff --git a/mm/vmscan.c b/mm/vmscan.c
index 3886b0bd7869..f51a33e8ed89 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -633,13 +633,14 @@ redo:
                 lru = LRU_UNEVICTABLE;
                 add_page_to_unevictable_list(page);
                 /*
-                 * When racing with an mlock clearing (page is
-                 * unlocked), make sure that if the other thread does
-                 * not observe our setting of PG_lru and fails
-                 * isolation, we see PG_mlocked cleared below and move
+                 * When racing with an mlock or AS_UNEVICTABLE clearing
+                 * (page is unlocked) make sure that if the other thread
+                 * does not observe our setting of PG_lru and fails
+                 * isolation/check_move_unevictable_page,
+                 * we see PG_mlocked/AS_UNEVICTABLE cleared below and move
                  * the page back to the evictable list.
                  *
-                 * The other side is TestClearPageMlocked().
+                 * The other side is TestClearPageMlocked() or shmem_lock().
                  */
                 smp_mb();
         }