diff options
| author | John Audia <graysky@archlinux.us> | 2020-08-26 06:29:39 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-08-30 19:44:47 +0200 |
| commit | 05b8e84362b8455dec6db9b862826f21e8f24341 (patch) | |
| tree | fc8ec494e6ca0531225d94be7346713d91e65893 /target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch | |
| parent | f589bd9283457f0bfddfeb2af468a413a3802b9b (diff) | |
| download | upstream-05b8e84362b8455dec6db9b862826f21e8f24341.tar.gz upstream-05b8e84362b8455dec6db9b862826f21e8f24341.tar.bz2 upstream-05b8e84362b8455dec6db9b862826f21e8f24341.zip | |
kernel: bump 5.4 to 5.4.61
Manually merged:
backport-5.4
011-kbuild-export-SUBARCH.patch
layerscape
701-net-0262-net-dsa-ocelot-add-tagger-for-Ocelot-Felix-switches.patch
All other modifications made by update_kernel.sh
Build-tested: x86/64, lantiq/xrx200, ramips/mt7621
Run-tested: ipq806x (R7800), lantiq/xrx200, x86/64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[minor commit message adjustments]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch b/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch index 96708ec09e..309782b460 100644 --- a/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch +++ b/target/linux/layerscape/patches-5.4/811-kvm-0002-arm-arm64-KVM-allow-specifying-s2-prot-bits-when-map.patch @@ -42,7 +42,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/mmu.c -@@ -1335,9 +1335,11 @@ static int stage2_pudp_test_and_clear_yo +@@ -1341,9 +1341,11 @@ static int stage2_pudp_test_and_clear_yo * @guest_ipa: The IPA at which to insert the mapping * @pa: The physical address of the device * @size: The size of the mapping @@ -55,7 +55,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> { phys_addr_t addr, end; int ret = 0; -@@ -1348,7 +1350,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv +@@ -1354,7 +1356,7 @@ int kvm_phys_addr_ioremap(struct kvm *kv pfn = __phys_to_pfn(pa); for (addr = guest_ipa; addr < end; addr += PAGE_SIZE) { @@ -64,7 +64,7 @@ Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com> if (writable) pte = kvm_s2pte_mkwrite(pte); -@@ -2347,7 +2349,7 @@ int kvm_arch_prepare_memory_region(struc +@@ -2356,7 +2358,7 @@ int kvm_arch_prepare_memory_region(struc ret = kvm_phys_addr_ioremap(kvm, gpa, pa, vm_end - vm_start, |