Merge tag 'iommu-updates-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 54bcd53..21dadf0 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1487,7 +1487,8 @@ again:
                        /* Only drop the uffd-wp marker if explicitly requested */
                        if (!zap_drop_file_uffd_wp(details))
                                continue;
-               } else if (is_hwpoison_entry(entry)) {
+               } else if (is_hwpoison_entry(entry) ||
+                          is_swapin_error_entry(entry)) {
                        if (!should_zap_cows(details))
                                continue;
                } else {
@@ -3727,6 +3728,8 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
                        ret = vmf->page->pgmap->ops->migrate_to_ram(vmf);
                } else if (is_hwpoison_entry(entry)) {
                        ret = VM_FAULT_HWPOISON;
+               } else if (is_swapin_error_entry(entry)) {
+                       ret = VM_FAULT_SIGBUS;
                } else if (is_pte_marker_entry(entry)) {
                        ret = handle_pte_marker(vmf);
                } else {