kernel: bump 5.4 to 5.4.79
[openwrt/staging/wigyori.git] / target / linux / layerscape / patches-5.4 / 811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
index 1b36b61e6200d33e77a22ac873c2cfb8f6adf5e2..91f48a78bcb8c0fc42d6e6e2b6159df4fb9bea3f 100644 (file)
@@ -105,7 +105,7 @@ Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
        if (kvm_is_device_pfn(pfn)) {
                mem_type = PAGE_S2_DEVICE;
                flags |= KVM_S2PTE_FLAG_IS_IOMAP;
-@@ -2351,6 +2395,9 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2352,6 +2396,9 @@ int kvm_arch_prepare_memory_region(struc
                        gpa_t gpa = mem->guest_phys_addr +
                                    (vm_start - mem->userspace_addr);
                        phys_addr_t pa;
@@ -115,7 +115,7 @@ Signed-off-by: Diana Craciun <diana.craciun@nxp.com>
  
                        pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT;
                        pa += vm_start - vma->vm_start;
-@@ -2361,9 +2408,13 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2362,9 +2409,13 @@ int kvm_arch_prepare_memory_region(struc
                                goto out;
                        }