diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2011-09-14 13:30:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-15 11:23:57 +0100 |
commit | 978f48b7e2654ac161d548811f3c023af4f04c62 (patch) | |
tree | a3a9da4e43310ca173607e9773d41a4c79087fdd | |
parent | 420a5455abb352adf01e32cf7cc1989eae788ebe (diff) | |
download | poky-978f48b7e2654ac161d548811f3c023af4f04c62.tar.gz |
linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c
Merging the following commit for the -rt machines:
[
preempt-rt/base: correct 3.0.3->3.0.4 mismerge for, stop_machine.c
Commit 0b805cce57f61a244eb3b8fce460b14f1be442b3 dropped a change making
stop_cpus_mutex non-static, resulting in a build failure for 3.0.4-rt
kernels.
Restore the move to non-static from commit
6857336c7fddaf460a13adc0c395698fcf9423ff.
Reported-by: Kishore Bodke <kishore.k.bodke@intel.com>
(From OE-Core rev: 1bc26dca631da53d956008a4570c46012c478435)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
]
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
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_3.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb index 36717d6bb3..b3bb4ac8fb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | |||
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32" | |||
14 | LINUX_VERSION ?= "3.0.4" | 14 | LINUX_VERSION ?= "3.0.4" |
15 | LINUX_KERNEL_TYPE = "preempt-rt" | 15 | LINUX_KERNEL_TYPE = "preempt-rt" |
16 | 16 | ||
17 | SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3" | 17 | SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" |
18 | SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af" | 18 | SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3" |
19 | SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c" | 19 | SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c" |
20 | 20 | ||
21 | PR = "r1" | 21 | PR = "r1" |