ARM: exynos4: Fix build error due to 'gic_bank_offset' undeclared

PATCH In review Axel Lin 3 participants 5 messages Dec 1, 2011 – Dec 2, 2011

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Axel Lin

author

2011-12-01 15:24 UTC #0 lore raw

PATCH 1/2 ARM: exynos4: Fix build error due to 'gic_bank_offset' undeclared

Fix below build error:
CC arch/arm/mach-exynos/cpu.o
arch/arm/mach-exynos/cpu.c: In function 'exynos4_init_irq':
arch/arm/mach-exynos/cpu.c:245: error: 'gic_bank_offset' undeclared (first use in this function) arch/arm/mach-exynos/cpu.c:245: error: (Each undeclared identifier is reported only once arch/arm/mach-exynos/cpu.c:245: error: for each function it appears in.) arch/arm/mach-exynos/cpu.c:243: warning: unused variable 'bank_offset'
make[1]: *** [arch/arm/mach-exynos/cpu.o] Error 1
make: *** [arch/arm/mach-exynos] Error 2

Signed-off-by Axel Lin <[email protected]>

---
 arch/arm/mach-exynos/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-exynos/cpu.c +1 -1

index fed62f4..c7cb462 100644
@@ -240,7 +240,7 @@ static const struct of_device_id exynos4_dt_irq_match[] = {
 void __init exynos4_init_irq(void)
 {
 	int irq;
-	unsigned int bank_offset;
+	unsigned int gic_bank_offset;
 
 	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;

Signature · 1 line

1.7.5.4

Axel Lin

author

2011-12-01 15:25 UTC #1 lore raw

PATCH 2/2 ARM: exynos4: Fix build error

Trivial fix to fix below build error:

CC arch/arm/mach-exynos/mach-universal_c210.o
arch/arm/mach-exynos/mach-universal_c210.c:24: error: expected identifier or '(' before '<' token

Signed-off-by Axel Lin <[email protected]>

---
 arch/arm/mach-exynos/mach-universal_c210.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-exynos/mach-universal_c210.c +1 -1

index 48e85b0..cfc7d50 100644
@@ -21,7 +21,7 @@
 #include <linux/mmc/host.h>
 #include <linux/i2c-gpio.h>
 #include <linux/i2c/mcs.h>
- <linux/i2c/atmel_mxt_ts.h>
+#include <linux/i2c/atmel_mxt_ts.h>
 
 #include <asm/mach/arch.h>
 #include <asm/hardware/gic.h>

Signature · 1 line

1.7.5.4

Marc Zyngier

Acked-by on v1 1/2

2011-12-01 16:39 UTC #2 lore raw

In reply to Axel Lin

Quoted 11 lines · Axel Lin

Fix below build error:
CC arch/arm/mach-exynos/cpu.o
arch/arm/mach-exynos/cpu.c: In function 'exynos4_init_irq':
arch/arm/mach-exynos/cpu.c:245: error: 'gic_bank_offset' undeclared (first use in this function) arch/arm/mach-exynos/cpu.c:245: error: (Each undeclared identifier is reported only once arch/arm/mach-exynos/cpu.c:245: error: for each function it appears in.) arch/arm/mach-exynos/cpu.c:243: warning: unused variable 'bank_offset'
make[1]: *** [arch/arm/mach-exynos/cpu.o] Error 1
make: *** [arch/arm/mach-exynos] Error 2
Signed-off-by Axel Lin <[email protected]>

Arghhh... My bad. Thanks for fixing that.

Acked-by Marc Zyngier <[email protected]>

Quoted 17 lines

---
 arch/arm/mach-exynos/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/mach-exynos/cpu.c +1 -1

index fed62f4..c7cb462 100644
@@ -240,7 +240,7 @@ static const struct of_device_id exynos4_dt_irq_match[] = {
 void __init exynos4_init_irq(void)
 {
 	int irq;
-	unsigned int bank_offset;
+	unsigned int gic_bank_offset;
 
 	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;

Signature · 1 line

Jazz is not dead. It just smells funny...

Kukjin Kim

2011-12-02 08:43 UTC #3 lore raw

Quoted 14 lines · Marc Zyngier

Quoted 4 lines · Axel Lin
Fix below build error:
CC arch/arm/mach-exynos/cpu.o
arch/arm/mach-exynos/cpu.c: In function 'exynos4_init_irq':
arch/arm/mach-exynos/cpu.c:245: error: 'gic_bank_offset' undeclared
(first use in this function)
Quoted 1 line
arch/arm/mach-exynos/cpu.c:245: error: (Each undeclared identifier is
reported only once
Quoted 5 lines
arch/arm/mach-exynos/cpu.c:245: error: for each function it appears in.) arch/arm/mach-exynos/cpu.c:243: warning: unused variable 'bank_offset' make[1]: *** [arch/arm/mach-exynos/cpu.o] Error 1
make: *** [arch/arm/mach-exynos] Error 2

Quoted 6 lines

Quoted 1 line
Signed-off-by Axel Lin <[email protected]>
Arghhh... My bad. Thanks for fixing that.
Acked-by Marc Zyngier <[email protected]>

Hi Marc,

Since the commit 4e44d2cb("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") is not in my tree, this should be handled in your tree and Axel's patch, "ARM: exynos4: Fix build error" is too.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

Quoted 22 lines

arch/arm/mach-exynos/cpu.c static const struct of_device_id
Quoted 9 lines
---
 arch/arm/mach-exynos/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-exynos/cpu.c +0 -0
index fed62f4..c7cb462 100644
@@ -240,7 +240,7 @@ static const struct of_device_id
exynos4_dt_irq_match[] = {
arch/arm/mach-exynos/cpu.c static const struct of_device_id exynos4_dt_irq_match[] = { · line 246
Quoted 8 lines
arch/arm/mach-exynos/cpu.c +1 -1
 void __init exynos4_init_irq(void)
 {
 	int irq;
-	unsigned int bank_offset;
+	unsigned int gic_bank_offset;
 
 	gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
 
--
Jazz is not dead. It just smells funny...

Marc Zyngier

2011-12-02 09:24 UTC #4 lore raw

Quoted 17 lines · Kukjin Kim

Quoted 16 lines · Marc Zyngier
Quoted 4 lines · Axel Lin
Fix below build error:
CC arch/arm/mach-exynos/cpu.o
arch/arm/mach-exynos/cpu.c: In function 'exynos4_init_irq':
arch/arm/mach-exynos/cpu.c:245: error: 'gic_bank_offset' undeclared
(first use in this function)
Quoted 1 line
arch/arm/mach-exynos/cpu.c:245: error: (Each undeclared identifier is
reported only once
Quoted 6 lines
arch/arm/mach-exynos/cpu.c:245: error: for each function it appears in.) arch/arm/mach-exynos/cpu.c:243: warning: unused variable 'bank_offset' make[1]: *** [arch/arm/mach-exynos/cpu.o] Error 1
make: *** [arch/arm/mach-exynos] Error 2
Signed-off-by Axel Lin <[email protected]>

Quoted 7 lines

Quoted 4 lines
Arghhh... My bad. Thanks for fixing that.
Acked-by Marc Zyngier <[email protected]>
Hi Marc,
Since the commit 4e44d2cb("ARM: exynos4: convert to CONFIG_MULTI_IRQ_HANDLER") is not in my tree, this should be handled in your tree and Axel's patch, "ARM: exynos4: Fix build error" is too.

Hi Kukjin,

No problem, I'll take these through my tree and send a pull request to Russell.

Cheers,

M.

Signature · 1 line

Jazz is not dead. It just smells funny...