diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-21 15:04:52 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2020-02-24 14:18:59 +0100 |
| commit | f4bea1b6a378fef02001cb86eebe2e51fe1c5427 (patch) | |
| tree | b533101ecb38aab9a2f34074627f64788191c834 /target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch | |
| parent | 7e9c7e7b2d4c36734912074aa1c19acea8f3801a (diff) | |
| download | upstream-f4bea1b6a378fef02001cb86eebe2e51fe1c5427.tar.gz upstream-f4bea1b6a378fef02001cb86eebe2e51fe1c5427.tar.bz2 upstream-f4bea1b6a378fef02001cb86eebe2e51fe1c5427.zip | |
kernel: bump 4.14 to 4.14.171
Refreshed all patches.
Fixes:
- CVE-2013-1798
Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
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 | 4 |
1 files changed, 2 insertions, 2 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 470aa683fa..5c8cd44182 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 @@ -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; -@@ -1918,6 +1961,9 @@ int kvm_arch_prepare_memory_region(struc +@@ -1919,6 +1962,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; -@@ -1928,9 +1974,13 @@ int kvm_arch_prepare_memory_region(struc +@@ -1929,9 +1975,13 @@ int kvm_arch_prepare_memory_region(struc goto out; } |