From 6f66e70586f3d399c0f41e38dc1a29f2bea67ae1 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Tue, 31 Aug 2010 18:24:45 -0500 Subject: [PATCH] --- yaml --- r: 212887 b: refs/heads/master c: 2ed38b23597284cc96a97e295cb145a6202dfcd4 h: refs/heads/master i: 212885: 598ab9a11bd28821097bda2c516c891b7654bec8 212883: 17964cd2870fe3f6bf091319fb3869e18fc78fb0 212879: 0f53328c34579cbf3aae2230e2469611eff1f48b v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_fsl_booke.S | 10 ++++++++-- trunk/arch/powerpc/kernel/setup_32.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f7d8540dbb5f..3f2707faf77f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7a07fd9617140c6111de82400ba1bad3162fb85 +refs/heads/master: 2ed38b23597284cc96a97e295cb145a6202dfcd4 diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/arch/powerpc/kernel/head_fsl_booke.S index 4faeba247854..529b817f473b 100644 --- a/trunk/arch/powerpc/kernel/head_fsl_booke.S +++ b/trunk/arch/powerpc/kernel/head_fsl_booke.S @@ -152,8 +152,11 @@ _ENTRY(__early_start) /* Check to see if we're the second processor, and jump * to the secondary_start code if so */ - mfspr r24,SPRN_PIR - cmpwi r24,0 + lis r24, boot_cpuid@h + ori r24, r24, boot_cpuid@l + lwz r24, 0(r24) + cmpwi r24, -1 + mfspr r24,SPRN_PIR bne __secondary_start #endif @@ -175,6 +178,9 @@ _ENTRY(__early_start) li r0,0 stwu r0,THREAD_SIZE-STACK_FRAME_OVERHEAD(r1) + rlwinm r22,r1,0,0,31-THREAD_SHIFT /* current thread_info */ + stw r24, TI_CPU(r22) + bl early_init #ifdef CONFIG_RELOCATABLE diff --git a/trunk/arch/powerpc/kernel/setup_32.c b/trunk/arch/powerpc/kernel/setup_32.c index 93666f9cabf1..8da1632f9fe7 100644 --- a/trunk/arch/powerpc/kernel/setup_32.c +++ b/trunk/arch/powerpc/kernel/setup_32.c @@ -46,7 +46,7 @@ extern void bootx_init(unsigned long r4, unsigned long phys); -int boot_cpuid; +int boot_cpuid = -1; EXPORT_SYMBOL_GPL(boot_cpuid); int boot_cpuid_phys;