[PATCH] ifdef gic_present variable that is used only by malta

[PATCH] ifdef gic_present variable that is used only by malta

[Anoop P A]

gic_present variable will be used only in malta platforms.Other
platforms with VSMP support will throw link error.
 

Signed-off-by: Anoop P A <anoop.pa@gmail.com>
---
 arch/mips/kernel/smp-mt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index 43e7cdc..5b91c1a 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -151,6 +151,7 @@ static void vsmp_send_ipi_mask(const struct cpumask
*mask, unsigned int action)
 
 static void __cpuinit vsmp_init_secondary(void)
 {
+#ifdef CONFIG_MIPS_MALTA
 	extern int gic_present;
 
 	/* This is Malta specific: IPI,performance and timer inetrrupts */
@@ -158,6 +159,7 @@ static void __cpuinit vsmp_init_secondary(void)
 		change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |
 					 STATUSF_IP6 | STATUSF_IP7);
 	else
+#endif /* CONFIG_MIPS_MALTA */
 		change_c0_status(ST0_IM, STATUSF_IP0 | STATUSF_IP1 |
 					 STATUSF_IP6 | STATUSF_IP7);
 }
-- 
1.7.0.4

Re: [PATCH] ifdef gic_present variable that is used only by malta

[Ralf Baechle]

Dropping this one - it's garbled.

  Ralf

Re: [PATCH resend] ifdef gic_present variable that is used only by malta

[Ralf Baechle]

On Tue, Jan 25, 2011 at 07:27:26PM +0530, Anoop P A wrote:

Duplicate of https://patchwork.linux-mips.org/patch/2039/ which you sent
earlier today - dropped.

  Ralf

[PATCH resend] ifdef gic_present variable that is used only by malta

[Anoop P A]

VSMP kernel build for non-malta platforms fails with following error

  LD      init/built-in.o
  LD      .tmp_vmlinux1
arch/mips/built-in.o: In function `vsmp_init_secondary':
smp-mt.c:(.cpuinit.text+0x23cc): undefined reference to `gic_present'
smp-mt.c:(.cpuinit.text+0x23d0): undefined reference to `gic_present'
make: *** [.tmp_vmlinux1] Error 1

gic_present variable is declared only if IRQ_GIC is selected.

Signed-off-by: Anoop P A <anoop.pa@gmail.com>
---
 arch/mips/kernel/smp-mt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/mips/kernel/smp-mt.c b/arch/mips/kernel/smp-mt.c
index c0e8141..54235b5 100644
--- a/arch/mips/kernel/smp-mt.c
+++ b/arch/mips/kernel/smp-mt.c
@@ -151,6 +151,7 @@ static void vsmp_send_ipi_mask(const struct cpumask
*mask, unsigned int action)
 
 static void __cpuinit vsmp_init_secondary(void)
 {
+#ifdef CONFIG_IRQ_GIC
 	extern int gic_present;
 
 	/* This is Malta specific: IPI,performance and timer interrupts */
@@ -158,6 +159,7 @@ static void __cpuinit vsmp_init_secondary(void)
 		change_c0_status(ST0_IM, STATUSF_IP3 | STATUSF_IP4 |
 					 STATUSF_IP6 | STATUSF_IP7);
 	else
+#endif
 		change_c0_status(ST0_IM, STATUSF_IP0 | STATUSF_IP1 |
 					 STATUSF_IP6 | STATUSF_IP7);
 }
-- 
1.7.0.4

Re: [PATCH resend] ifdef gic_present variable that is used only by malta

[John Crispin]

On 25/01/11 14:57, Anoop P A wrote:
> VSMP kernel build for non-malta platforms fails with following error
> 
>   LD      init/built-in.o
>   LD      .tmp_vmlinux1
> arch/mips/built-in.o: In function `vsmp_init_secondary':
> smp-mt.c:(.cpuinit.text+0x23cc): undefined reference to `gic_present'
> smp-mt.c:(.cpuinit.text+0x23d0): undefined reference to `gic_present'
> make: *** [.tmp_vmlinux1] Error 1
> 
> gic_present variable is declared only if IRQ_GIC is selected.
> 
> Signed-off-by: Anoop P A <anoop.pa@gmail.com>


Thanks, queued for 3.7. (with a slightly different Subject)

	John