diff options
Diffstat (limited to 'target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch')
| -rw-r--r-- | target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch index 07bfef9cf2..2d26637894 100644 --- a/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch @@ -127,7 +127,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> static bool transparent_hugepage_adjust(kvm_pfn_t *pfnp, phys_addr_t *ipap) { kvm_pfn_t pfn = *pfnp; -@@ -1334,6 +1360,18 @@ static int user_mem_abort(struct kvm_vcp +@@ -1340,6 +1366,18 @@ static int user_mem_abort(struct kvm_vcp hugetlb = true; gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT; } else { @@ -146,7 +146,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> /* * Pages belonging to memslots that don't have the same * alignment for userspace and IPA cannot be mapped using -@@ -1375,6 +1413,11 @@ static int user_mem_abort(struct kvm_vcp +@@ -1381,6 +1419,11 @@ static int user_mem_abort(struct kvm_vcp if (is_error_noslot_pfn(pfn)) return -EFAULT; @@ -158,7 +158,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> if (kvm_is_device_pfn(pfn)) { mem_type = PAGE_S2_DEVICE; flags |= KVM_S2PTE_FLAG_IS_IOMAP; -@@ -1911,6 +1954,9 @@ int kvm_arch_prepare_memory_region(struc +@@ -1917,6 +1960,9 @@ int kvm_arch_prepare_memory_region(struc gpa_t gpa = mem->guest_phys_addr + (vm_start - mem->userspace_addr); phys_addr_t pa; @@ -168,7 +168,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com> pa = (phys_addr_t)vma->vm_pgoff << PAGE_SHIFT; pa += vm_start - vma->vm_start; -@@ -1921,9 +1967,13 @@ int kvm_arch_prepare_memory_region(struc +@@ -1927,9 +1973,13 @@ int kvm_arch_prepare_memory_region(struc goto out; } |