aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2020-09-17 09:51:25 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-09-19 12:41:29 +0200
commit770a9c678756462ab0d94656f1fcc30624a31bd0 (patch)
tree478ff3eb3f959854381fa4501055f8353e7151c5 /target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
parentbf2870c1d9e162f27925e9c40eca9e0069096f3b (diff)
downloadupstream-770a9c678756462ab0d94656f1fcc30624a31bd0.tar.gz
upstream-770a9c678756462ab0d94656f1fcc30624a31bd0.tar.bz2
upstream-770a9c678756462ab0d94656f1fcc30624a31bd0.zip
kernel: bump 5.4 to 5.4.66
All modifications made by update_kernel.sh/no manual intervention needed Run-tested: ipq806x (R7800), ath79 (Archer C7v5), x86/64 No dmesg regressions, everything appears functional Signed-off-by: John Audia <graysky@archlinux.us> [add run test from PR] Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch b/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
index 47ec98ec24..1b36b61e62 100644
--- a/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
+++ b/target/linux/layerscape/patches-5.4/811-kvm-0003-arm-arm64-KVM-drop-qman-mmio-cacheable-mapping-hack.patch
@@ -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;
-@@ -2346,6 +2390,9 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2351,6 +2395,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;
-@@ -2356,9 +2403,13 @@ int kvm_arch_prepare_memory_region(struc
+@@ -2361,9 +2408,13 @@ int kvm_arch_prepare_memory_region(struc
goto out;
}