linux-next: omap2plus_defconfig not building

[gadiyar@ti.com (Anand Gadiyar)]

On 10/19/2010 5:07 PM, Catalin Marinas wrote:
> On Tue, 2010-10-19 at 11:18 +0100, Anand Gadiyar wrote:
>> Commit ba1b9be5cd in linux-next (ARM: Add SWP/SWPB emulation for ARMv7
>> processors (v5)) introduced arch/arm/kernel/swp_emulate.c. This file
>> gets compiled when the omap2plus_defconfig is built - the
>> omap2plus_defconfig builds OMAP2420, OMAP2430, OMAP3 and OMAP4 in one
>> image, and has CPU_V6 and CPU_V7 both enabled.
>
> This patch should fix it:
>

Yes, it does. I've not yet boot tested on omap2; will try
that out in a bit.

OMAP3 and OMAP4 still don't boot on next if support for both are 
compiled together, however that's a separate issue to debug.

Thanks!

- Anand


>
> ARM: Do not enable SWP emulation if CPU_V6&&  CPU_V7
>
> From: Catalin Marinas<catalin.marinas@arm.com>
>
> This option uses LDREXB/STREXB to emulate SWPB but these instructions
> are not supported on all the ARMv6 processors.
>
> Reported-by: Anand Gadiyar<gadiyar@ti.com>
> Signed-off-by: Catalin Marinas<catalin.marinas@arm.com>
> Cc: Leif Lindholm<Leif.Lindholm@arm.com>
> ---
>   arch/arm/mm/Kconfig |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
> index 8493ed0..5195d61 100644
> --- a/arch/arm/mm/Kconfig
> +++ b/arch/arm/mm/Kconfig
> @@ -638,7 +638,7 @@ config ARM_THUMBEE
>
>   config SWP_EMULATE
>   	bool "Emulate SWP/SWPB instructions"
> -	depends on CPU_V7
> +	depends on CPU_V7&&  !CPU_V6
>   	select HAVE_PROC_CPU if PROC_FS
>   	default y if SMP
>   	help
>
>