On Thu, Aug 19, 2010 at 10:38:11AM +0300, Tony Lindgren wrote:
> --- a/arch/arm/kernel/head.S
> +++ b/arch/arm/kernel/head.S
> @@ -346,8 +346,10 @@ __fixup_smp:
> bne smp_on_up @ no, assume UP
> mrc p15, 0, r0, c0, c0, 5 @ read MIDR
> movs r0, r0, lsr #30
> - teqne r0, #3 @ check top two bits 00 or 11
> - moveq pc, lr
> + teq r0, #0 @ check two top bits 00
> + beq smp_on_up @ yes, assume UP
> + teq r0, #3 @ check top two bits 11
> + movne pc, lr @ no, running on SMP hw
This should be:
movs r0, r0, lsr #30
teqne r0, #3
movne pc, lr
so that 0 or 3 avoids the return.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
