diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-14 16:14:18 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-02-19 06:16:58 -0800 |
commit | 315e8835ec5e205bbd52a4ee2ba788555a9eccb3 (patch) | |
tree | c25161e1985ed2bb44d5c6e5f1356a134c95b842 | |
parent | eccbb9a67094e3ca88fd6f4df5c3d95c4b65512b (diff) | |
download | poky-315e8835ec5e205bbd52a4ee2ba788555a9eccb3.tar.gz |
linux-yocto-rt/4.9: integrate 4.9-rt4
Integrating the 4.9-rt4 new changes:
56a3dd6fb4e9 x86/mm/cpa: avoid wbinvd() for PREEMPT
221db3244e71 pinctrl: qcom: Use raw spinlock variants
43158f23e188 radix-tree: use local locks
109a8fea2c4a cpuset: Convert callback_lock to raw_spinlock_t
3741fb19d20f softirq: wake the timer softirq if needed
(From OE-Core rev: c1fd9a544d2165c0f3d827d3ad3c90f9c7781f09)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_4.9.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb index 771adaa801..94697ee986 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb | |||
@@ -11,8 +11,8 @@ python () { | |||
11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "ff62b282b523e48abb8f8304ff46ebcc88913757" | 14 | SRCREV_machine ?= "01a64b0469256a432af0b8a0f27d32694e908e8b" |
15 | SRCREV_meta ?= "2c9c93fb141832b1416824387491dd95a9d627c6" | 15 | SRCREV_meta ?= "8d1042fc4b23d184688b0e6931dd4e7ff4807273" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ | 17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ |
18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | 18 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb index 8910bee524..34354f0272 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb | |||
@@ -10,7 +10,7 @@ KMETA = "kernel-meta" | |||
10 | KCONF_BSP_AUDIT_LEVEL = "2" | 10 | KCONF_BSP_AUDIT_LEVEL = "2" |
11 | 11 | ||
12 | SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" | 12 | SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" |
13 | SRCREV_meta ?= "2c9c93fb141832b1416824387491dd95a9d627c6" | 13 | SRCREV_meta ?= "8d1042fc4b23d184688b0e6931dd4e7ff4807273" |
14 | 14 | ||
15 | PV = "${LINUX_VERSION}+git${SRCPV}" | 15 | PV = "${LINUX_VERSION}+git${SRCPV}" |
16 | 16 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb index f91cab3245..6795d2cb1f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb +++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb | |||
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" | |||
19 | SRCREV_machine_qemux86-64 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" | 19 | SRCREV_machine_qemux86-64 ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" |
20 | SRCREV_machine_qemumips64 ?= "13818cbe0b9f0e2e7542b7c088b5719c7a463da9" | 20 | SRCREV_machine_qemumips64 ?= "13818cbe0b9f0e2e7542b7c088b5719c7a463da9" |
21 | SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" | 21 | SRCREV_machine ?= "c85c54f5bf53b98afe8105e91bffcdb6c60afe8f" |
22 | SRCREV_meta ?= "2c9c93fb141832b1416824387491dd95a9d627c6" | 22 | SRCREV_meta ?= "8d1042fc4b23d184688b0e6931dd4e7ff4807273" |
23 | 23 | ||
24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ | 24 | SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ |
25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" | 25 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" |