linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Mark Brown <broonie@kernel.org>
Cc: linux-mm@kvack.org, Matthew Wilcox <willy@infradead.org>
Subject: [PATCH] mm/migrate: fix pmd_migration_entry_wait() (merge issue in linux-next)
Date: Thu, 16 Dec 2021 11:38:37 +0300	[thread overview]
Message-ID: <20211216083837.GA9094@kili> (raw)

The "ptl = pmd_lock(mm, pmd);" line was accidentally deleted in the
linux-next merge for next-20211214.

Fixes: fd93c9fe58cc ("Merge branch 'akpm-current/current'")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 mm/migrate.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mm/migrate.c b/mm/migrate.c
index 8d93dfb0b9e1..c9296d63878d 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -339,6 +339,8 @@ void pmd_migration_entry_wait(struct mm_struct *mm, pmd_t *pmd)
 {
 	spinlock_t *ptl;
 	struct folio *folio;
+
+	ptl = pmd_lock(mm, pmd);
 	if (!is_pmd_migration_entry(*pmd))
 		goto unlock;
 	folio = page_folio(pfn_swap_entry_to_page(pmd_to_swp_entry(*pmd)));
-- 
2.20.1



                 reply	other threads:[~2021-12-16  8:39 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211216083837.GA9094@kili \
    --to=dan.carpenter@oracle.com \
    --cc=broonie@kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).