Merge 5.15.40 into android-5.15
Changes in 5.15.40
x86/lib/atomic64_386_32: Rename things
x86: Prepare asm files for straight-line-speculation
x86: Prepare inline-asm for straight-line-speculation
objtool: Add straight-line-speculation validation
x86/alternative: Relax text_poke_bp() constraint
kbuild: move objtool_args back to scripts/Makefile.build
x86: Add straight-line-speculation mitigation
tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy'
kvm/emulate: Fix SETcc emulation function offsets with SLS
crypto: x86/poly1305 - Fixup SLS
objtool: Fix SLS validation for kcov tail-call replacement
Bluetooth: Fix the creation of hdev->name
rfkill: uapi: fix RFKILL_IOCTL_MAX_SIZE ioctl request definition
udf: Avoid using stale lengthOfImpUse
mm: fix missing cache flush for all tail pages of compound page
mm: hugetlb: fix missing cache flush in copy_huge_page_from_user()
mm: shmem: fix missing cache flush in shmem_mfill_atomic_pte()
mm: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic()
mm/hwpoison: fix error page recovered but reported "not recovered"
mm/mlock: fix potential imbalanced rlimit ucounts adjustment
mm: fix invalid page pointer returned with FOLL_PIN gups
Linux 5.15.40
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I039f8014f8e898f74f2f98ab71ef29c39a1ad544
This commit is contained in:
@@ -949,9 +949,12 @@ static int move_to_new_page(struct page *newpage, struct page *page,
|
||||
if (!PageMappingFlags(page))
|
||||
page->mapping = NULL;
|
||||
|
||||
if (likely(!is_zone_device_page(newpage)))
|
||||
flush_dcache_page(newpage);
|
||||
if (likely(!is_zone_device_page(newpage))) {
|
||||
int i, nr = compound_nr(newpage);
|
||||
|
||||
for (i = 0; i < nr; i++)
|
||||
flush_dcache_page(newpage + i);
|
||||
}
|
||||
}
|
||||
out:
|
||||
return rc;
|
||||
|
||||
Reference in New Issue
Block a user