diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-08-24 10:59:48 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 10:30:28 +0100 |
commit | 51742a36c5359ae0de905b41cca0f5ad0ccbd5bf (patch) | |
tree | d74fbb666fed385359282e8cb8f6165b471ca839 /meta | |
parent | 826ca01dfac0b94346330751dd619561b00ab295 (diff) | |
download | poky-51742a36c5359ae0de905b41cca0f5ad0ccbd5bf.tar.gz |
linux-yocto/4.14: rt: Revert mm/vmstat.c: fix vmstat_update() preemption BUG
Reverting mm/vmstat.c: fix vmstat_update() preemption BUG, to fix
failures in the 4.14 -rt kernel.
(From OE-Core rev: 2f06c9eadc17e4d2b4d81b0a4088e9f0e8556217)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.14.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb index c5cb7b419a..4963612aac 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.14.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "7e0d6d525a8deb7329c0d8f844880c5ec6c0b84a" | 14 | SRCREV_machine ?= "0f7a6d5209e60e88f9bc39298229113e58db1b82" |
15 | SRCREV_meta ?= "d64aec9793d558ff49993ff6076be6d4daf101c2" | 15 | SRCREV_meta ?= "49e24e3e2cad518ae1fd7eff05f3228201b54a33" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb index da1ba6193f..85f3ce1d99 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.14.bb | |||
@@ -13,7 +13,7 @@ KMETA = "kernel-meta" | |||
13 | KCONF_BSP_AUDIT_LEVEL = "2" | 13 | KCONF_BSP_AUDIT_LEVEL = "2" |
14 | 14 | ||
15 | SRCREV_machine ?= "dd893e600276f4e05e416cf5be73a5fd5752e0cb" | 15 | SRCREV_machine ?= "dd893e600276f4e05e416cf5be73a5fd5752e0cb" |
16 | SRCREV_meta ?= "d64aec9793d558ff49993ff6076be6d4daf101c2" | 16 | SRCREV_meta ?= "49e24e3e2cad518ae1fd7eff05f3228201b54a33" |
17 | 17 | ||
18 | PV = "${LINUX_VERSION}+git${SRCPV}" | 18 | PV = "${LINUX_VERSION}+git${SRCPV}" |
19 | 19 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.14.bb b/meta/recipes-kernel/linux/linux-yocto_4.14.bb index 9ea3135151..1d038a9151 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.14.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.14.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" | |||
19 | SRCREV_machine_qemux86-64 ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" | 19 | SRCREV_machine_qemux86-64 ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" |
20 | SRCREV_machine_qemumips64 ?= "346488cf46ac4045fe257eb63836eb93c7c09859" | 20 | SRCREV_machine_qemumips64 ?= "346488cf46ac4045fe257eb63836eb93c7c09859" |
21 | SRCREV_machine ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" | 21 | SRCREV_machine ?= "97c8063d2df381b828b37608f88efa9b4dd9e379" |
22 | SRCREV_meta ?= "d64aec9793d558ff49993ff6076be6d4daf101c2" | 22 | SRCREV_meta ?= "49e24e3e2cad518ae1fd7eff05f3228201b54a33" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.14;destsuffix=${KMETA}" |