Merge 5.10.116 into android12-5.10-lts
Changes in 5.10.116 MIPS: Use address-of operator on section symbols regulator: consumer: Add missing stubs to regulator/consumer.h block: drbd: drbd_nl: Make conversion to 'enum drbd_ret_code' explicit drm/amd/display/dc/gpio/gpio_service: Pass around correct dce_{version, environment} types nfp: bpf: silence bitwise vs. logical OR warning arm: remove CONFIG_ARCH_HAS_HOLES_MEMORYMODEL Bluetooth: Fix the creation of hdev->name 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: userfaultfd: fix missing cache flush in mcopy_atomic_pte() and __mcopy_atomic() Linux 5.10.116 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: Ie56f60d172ca37af63c180390007d6b65d0618a5
This commit is contained in:
@@ -985,9 +985,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