[OE-core] [PATCH 3/3] linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c

Bruce Ashfield bruce.ashfield at windriver.com
Wed Sep 14 18:11:12 UTC 2011


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 at intel.com>
    Signed-off-by: Darren Hart <dvhart at linux.intel.com>
]

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield at windriver.com>
---
 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 36717d6..b3bb4ac 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"
 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"
-- 
1.7.4.1





More information about the Openembedded-core mailing list