From 1bc26dca631da53d956008a4570c46012c478435 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 14 Sep 2011 13:30:59 -0400 Subject: 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 Signed-off-by: Darren Hart ] Signed-off-by: Darren Hart Signed-off-by: Bruce Ashfield --- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta') 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 36717d6bb..b3bb4ac8f 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" -- cgit v1.2.3