From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Mon, 11 Dec 2023 08:20:59 +0000 Subject: [PATCH] kernel_5.10 no rt --- kernel/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c b/kernel/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c index b4b57e0..b9de93e 100644 --- a/kernel/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c +++ b/kernel/drivers/gpu/arm/mali400/mali/linux/mali_memory_cow.c @@ -529,13 +529,13 @@ list_for_each_entry(m_page, &cow->pages, list) { /* We should use vm_insert_page, but it does a dcache - * flush which makes it way slower than remap_pfn_range or vm_insert_pfn. + * flush which makes it way slower than remap_pfn_range or vmf_insert_pfn. ret = vm_insert_page(vma, addr, page); */ - ret = vm_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page)); + ret = vmf_insert_pfn(vma, addr, _mali_page_node_get_pfn(m_page)); - if (unlikely(0 != ret)) { - return ret; + if (unlikely(VM_FAULT_NOPAGE != ret)) { + return -EFAULT; } addr += _MALI_OSK_MALI_PAGE_SIZE; } @@ -569,9 +569,9 @@ list_for_each_entry(m_page, &cow->pages, list) { if ((count >= offset) && (count < offset + num)) { - ret = vm_insert_pfn(vma, vaddr, _mali_page_node_get_pfn(m_page)); + ret = vmf_insert_pfn(vma, vaddr, _mali_page_node_get_pfn(m_page)); - if (unlikely(0 != ret)) { + if (unlikely(VM_FAULT_NOPAGE != ret)) { if (count == offset) { return _MALI_OSK_ERR_FAULT; } else { -- Gitblit v1.6.2