summaryrefslogtreecommitdiffstats
path: root/mm/memory.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 19:22:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-05 19:22:03 +0000
commit4fe40b02212fc6ae213fa2082322c3401433a0a3 (patch)
treee1bf3b779c1dc9c5337c4442bf720073a3a53415 /mm/memory.c
parentAdding upstream version 6.9.7. (diff)
downloadlinux-4fe40b02212fc6ae213fa2082322c3401433a0a3.tar.xz
linux-4fe40b02212fc6ae213fa2082322c3401433a0a3.zip
Adding upstream version 6.9.8.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c
index d2155ced45..4bd6d68f1b 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4583,8 +4583,9 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page)
if (!thp_vma_suitable_order(vma, haddr, PMD_ORDER))
return ret;
- if (page != &folio->page || folio_order(folio) != HPAGE_PMD_ORDER)
+ if (folio_order(folio) != HPAGE_PMD_ORDER)
return ret;
+ page = &folio->page;
/*
* Just backoff if any subpage of a THP is corrupted otherwise