mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c

Browse Source 
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>
This commit is contained in:
Bruce Ashfield
2011-09-14 13:30:59 -04:00
committed by Richard Purdie
parent 420a5455ab
commit 978f48b7e2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+2 -2
View File
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
LINUX_VERSION ?= "3.0.4"
LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
PR = "r1"