aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-09 12:42:26 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-09-11 09:57:28 +0200
commit2cd89cf0d7d00469aa79f626530869f6e3ee33d4 (patch)
treec52f4241bb56e6007bb6c0621ddd6a5eb41d8d15 /target/linux/layerscape
parente8c5e6177d39c7db7eb90534edc5b259628aca98 (diff)
downloadupstream-2cd89cf0d7d00469aa79f626530869f6e3ee33d4.tar.gz
upstream-2cd89cf0d7d00469aa79f626530869f6e3ee33d4.tar.bz2
upstream-2cd89cf0d7d00469aa79f626530869f6e3ee33d4.zip
kernel: bump 4.14 to 4.4.142
Refreshed all patches. Remove upstreamed: - 0032-usb-host-fotg2-restart-hcd-after-port-reset.patch Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape')
-rw-r--r--target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch2
1 files changed, 1 insertions, 1 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 2d26637894..502a99fa87 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
@@ -196,7 +196,7 @@ Signed-off-by: Signed-off-by: Biwen Li <biwen.li@nxp.com>
--- a/virt/kvm/arm/vgic/vgic-v2.c
+++ b/virt/kvm/arm/vgic/vgic-v2.c
-@@ -304,7 +304,8 @@ int vgic_v2_map_resources(struct kvm *kv
+@@ -307,7 +307,8 @@ int vgic_v2_map_resources(struct kvm *kv
if (!static_branch_unlikely(&vgic_v2_cpuif_trap)) {
ret = kvm_phys_addr_ioremap(kvm, dist->vgic_cpu_base,
kvm_vgic_global_state.vcpu_base,