[PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[Namhyung Kim]

  CC      arch/sparc/kernel/irq_32.o
arch/sparc/kernel/irq_32.c: In function 'request_fast_irq':
arch/sparc/kernel/irq_32.c:370:25: error: conflicting types for 'trapbase_cpu1'
arch/sparc/include/asm/leon.h:366:22: note: previous declaration of 'trapbase_cpu1' was here
arch/sparc/kernel/irq_32.c:370:40: error: conflicting types for 'trapbase_cpu2'
arch/sparc/include/asm/leon.h:367:22: note: previous declaration of 'trapbase_cpu2' was here
arch/sparc/kernel/irq_32.c:370:55: error: conflicting types for 'trapbase_cpu3'
arch/sparc/include/asm/leon.h:368:22: note: previous declaration of 'trapbase_cpu3' was here
make[3]: *** [arch/sparc/kernel/irq_32.o] Error 1
make[2]: *** [arch/sparc/kernel] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
---
 arch/sparc/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 4db8bc0..a6685ba 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -463,7 +463,7 @@ config SERIAL_CONSOLE
 
 config SPARC_LEON
 	bool "Sparc Leon processor family"
-	depends on SPARC32
+	depends on SPARC32 && !SMP
 	---help---
 	  If you say Y here if you are running on a SPARC-LEON processor.
 	  The LEON processor is a synthesizable VHDL model of the
-- 
1.7.0.4

Re: [PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[David Miller]

From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 27 Oct 2010 00:51:43 +0900

>   CC      arch/sparc/kernel/irq_32.o
> arch/sparc/kernel/irq_32.c: In function 'request_fast_irq':
> arch/sparc/kernel/irq_32.c:370:25: error: conflicting types for 'trapbase_cpu1'
> arch/sparc/include/asm/leon.h:366:22: note: previous declaration of 'trapbase_cpu1' was here
> arch/sparc/kernel/irq_32.c:370:40: error: conflicting types for 'trapbase_cpu2'
> arch/sparc/include/asm/leon.h:367:22: note: previous declaration of 'trapbase_cpu2' was here
> arch/sparc/kernel/irq_32.c:370:55: error: conflicting types for 'trapbase_cpu3'
> arch/sparc/include/asm/leon.h:368:22: note: previous declaration of 'trapbase_cpu3' was here
> make[3]: *** [arch/sparc/kernel/irq_32.o] Error 1
> make[2]: *** [arch/sparc/kernel] Error 2
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2
> 
> Signed-off-by: Namhyung Kim <namhyung@gmail.com>

Great, I'll apply all three of your patches thanks.

Re: [PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[Namhyung Kim]

2010-10-26 (화), 08:53 -0700, David Miller:
> Great, I'll apply all three of your patches thanks.

Thanks. BTW, can you please take a look below too?

http://lkml.org/lkml/2010/10/25/13


-- 
Regards,
Namhyung Kim

Re: [PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[David Miller]

From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 27 Oct 2010 01:02:40 +0900

> 2010-10-26 (화), 08:53 -0700, David Miller:
>> Great, I'll apply all three of your patches thanks.
> 
> Thanks. BTW, can you please take a look below too?
> 
> http://lkml.org/lkml/2010/10/25/13

Sure.

Re: [PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[David Miller]

From: David Miller <davem@davemloft.net>
Date: Tue, 26 Oct 2010 09:04:28 -0700 (PDT)

> From: Namhyung Kim <namhyung@gmail.com>
> Date: Wed, 27 Oct 2010 01:02:40 +0900
> 
>> 2010-10-26 (화), 08:53 -0700, David Miller:
>>> Great, I'll apply all three of your patches thanks.
>> 
>> Thanks. BTW, can you please take a look below too?
>> 
>> http://lkml.org/lkml/2010/10/25/13
> 
> Sure.

I've applied this.

Please CC: sparclinux@vger.kernel.org on such patches next time, so
that it gets into my patchwork queue and you don't need to ask me
to go looking around in other places for your patches.

Thanks.

Re: [PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[Namhyung Kim]

2010-10-26 (화), 09:32 -0700, David Miller:
> From: David Miller <davem@davemloft.net>
> Date: Tue, 26 Oct 2010 09:04:28 -0700 (PDT)
> 
> > From: Namhyung Kim <namhyung@gmail.com>
> > Date: Wed, 27 Oct 2010 01:02:40 +0900
> > 
> >> 2010-10-26 (화), 08:53 -0700, David Miller:
> >>> Great, I'll apply all three of your patches thanks.
> >> 
> >> Thanks. BTW, can you please take a look below too?
> >> 
> >> http://lkml.org/lkml/2010/10/25/13
> > 
> > Sure.
> 
> I've applied this.
> 
> Please CC: sparclinux@vger.kernel.org on such patches next time, so
> that it gets into my patchwork queue and you don't need to ask me
> to go looking around in other places for your patches.
> 
> Thanks.

OK. I accidentally missed that, sorry. And thanks again for your quick
responses and all great works. :-)


-- 
Regards,
Namhyung Kim

Re: [PATCH] sparc32: make CONFIG_SPARC_LEON depends on !SMP to fix build failure

[David Miller]

From: Namhyung Kim <namhyung@gmail.com>
Date: Wed, 27 Oct 2010 00:51:43 +0900

> diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
> index 4db8bc0..a6685ba 100644
> --- a/arch/sparc/Kconfig
> +++ b/arch/sparc/Kconfig
> @@ -463,7 +463,7 @@ config SERIAL_CONSOLE
>  
>  config SPARC_LEON
>  	bool "Sparc Leon processor family"
> -	depends on SPARC32
> +	depends on SPARC32 && !SMP
>  	---help---
>  	  If you say Y here if you are running on a SPARC-LEON processor.
>  	  The LEON processor is a synthesizable VHDL model of the
> -- 

Upon further consideration, since not only do SMP leon chips exist,
but people are posting real bug fixes for that configuration, I'll
apply your original patch.

Thanks!