From 872a83be6e86005f6426c90073ece56de4534ac0 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 7 Sep 2016 21:08:49 -0400 Subject: linux-yocto/4.4/4.8: uvesafb: provide option to specify timeout for task completion Integrating the following patch: [ We try to make this change a generic extension, but it is actually for a corner case. When a VM (qemu) gets a very limited cpu bandwidth from host, which could be under a heavy load, the existing 5000 ms timeout could occur and trigger error messages in the task function's callers. This change adds a new timeout parameter so that we can tweak the value as a workaround or for troubleshooting purposes. In the infinite wait case, A warning message is printed at 5000ms interval. In real world, the current 5 sec is generous enough for a video request in my opinion, so this change could not be very useful. Upstream Status: Inappropriate Signed-off-by: Jianxun Zhang ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_4.4.bb | 18 +++++++++--------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index fc0e2a431e..e7057005d1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "9135adcfb01432abe4a95a50fca5d0395239f798" -SRCREV_meta ?= "698835841165b68089604398f68fd8bc3f79cb65" +SRCREV_machine ?= "a52822c864c50cc5e42939d217a8559fbf853fde" +SRCREV_meta ?= "59290c5f6192da2eccf478d37a8f9f88134822b3" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index 1334a8606e..e73754519c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.4.18" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" -SRCREV_meta ?= "698835841165b68089604398f68fd8bc3f79cb65" +SRCREV_machine ?= "a67e1ae4bf3570e93f8d8fe33b1830de058c1b72" +SRCREV_meta ?= "59290c5f6192da2eccf478d37a8f9f88134822b3" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 8661452c74..6e5a7c7920 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "81cae0bb962c278b7fd616ce94b0a1ea21b9a938" -SRCREV_machine_qemuarm64 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" -SRCREV_machine_qemumips ?= "92bae966ed0bdf4bd8c8343978f83b80b8fa9981" -SRCREV_machine_qemuppc ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" -SRCREV_machine_qemux86 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" -SRCREV_machine_qemux86-64 ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" -SRCREV_machine_qemumips64 ?= "aa125473aef74e7731b14f6b56c1b50589fcd668" -SRCREV_machine ?= "0a0c93f29c0d65c00abdd2f6d1eb89134fae9525" -SRCREV_meta ?= "698835841165b68089604398f68fd8bc3f79cb65" +SRCREV_machine_qemuarm ?= "2505d9c2441eb638d55b330144988d1730065074" +SRCREV_machine_qemuarm64 ?= "a67e1ae4bf3570e93f8d8fe33b1830de058c1b72" +SRCREV_machine_qemumips ?= "544caf9c03c40c2de6b93db9a767e568e0baaa8f" +SRCREV_machine_qemuppc ?= "a67e1ae4bf3570e93f8d8fe33b1830de058c1b72" +SRCREV_machine_qemux86 ?= "a67e1ae4bf3570e93f8d8fe33b1830de058c1b72" +SRCREV_machine_qemux86-64 ?= "a67e1ae4bf3570e93f8d8fe33b1830de058c1b72" +SRCREV_machine_qemumips64 ?= "c1b45251a5fabfb0f2aba3a0168d8a952a2cd827" +SRCREV_machine ?= "a67e1ae4bf3570e93f8d8fe33b1830de058c1b72" +SRCREV_meta ?= "59290c5f6192da2eccf478d37a8f9f88134822b3" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -- cgit 1.2.3-korg