ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c

PATCH In review Axel Lin 3 participants 5 messages Sep 2, 2012 – Sep 3, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/nomadik/Ux500 architectures

lore

Share & tools

lore

Axel Lin

author

2012-09-02 12:25 UTC #0 lore raw

PATCH 1/1 ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c

Include asm/pmu.h to fix below build error:

CC arch/arm/mach-ux500/cpu-db8500.o
arch/arm/mach-ux500/cpu-db8500.c:118:8: error: variable 'db8500_pmu_platdata' has initializer but incomplete type arch/arm/mach-ux500/cpu-db8500.c:119:2: error: unknown field 'handle_irq' specified in initializer arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: excess elements in struct initializer [enabled by default] arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: (near initialization for 'db8500_pmu_platdata') [enabled by default] make[1]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2

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

---
 arch/arm/mach-ux500/cpu-db8500.c |    1 +
 1 file changed, 1 insertion(+)

arch/arm/mach-ux500/cpu-db8500.c +1 -0

index 8169f2c..3ce7d94 100644
@@ -18,6 +18,7 @@
 #include <linux/io.h>
 #include <linux/mfd/abx500/ab8500.h>
 
+#include <asm/pmu.h>
 #include <asm/mach/map.h>
 #include <plat/gpio-nomadik.h>
 #include <mach/hardware.h>

Signature · 1 line

1.7.9.5

Linus Walleij

2012-09-03 10:47 UTC #1 lore raw

Quoted 11 lines · Axel Lin

Include asm/pmu.h to fix below build error:
CC arch/arm/mach-ux500/cpu-db8500.o
arch/arm/mach-ux500/cpu-db8500.c:118:8: error: variable 'db8500_pmu_platdata' has initializer but incomplete type arch/arm/mach-ux500/cpu-db8500.c:119:2: error: unknown field 'handle_irq' specified in initializer arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: excess elements in struct initializer [enabled by default] arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: (near initialization for 'db8500_pmu_platdata') [enabled by default] make[1]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2
Signed-off-by Axel Lin <[email protected]>

That's on linux-next not on v3.6-rcN right?

I've applied it to my ux500 branch and will carry it unless Will Deacon express an interest in it, PMU is his territory...

Yours,
Linus Walleij

Axel Lin

author

2012-09-03 11:40 UTC #2 lore raw

2012/9/3 Linus Walleij <[email protected]>:

Quoted 12 lines · Axel Lin

Quoted 11 lines
Include asm/pmu.h to fix below build error:
CC arch/arm/mach-ux500/cpu-db8500.o
arch/arm/mach-ux500/cpu-db8500.c:118:8: error: variable 'db8500_pmu_platdata' has initializer but incomplete type arch/arm/mach-ux500/cpu-db8500.c:119:2: error: unknown field 'handle_irq' specified in initializer arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: excess elements in struct initializer [enabled by default] arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: (near initialization for 'db8500_pmu_platdata') [enabled by default] make[1]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2

Quoted 3 lines

Quoted 1 line
Signed-off-by Axel Lin <[email protected]>
That's on linux-next not on v3.6-rcN right?

Yes, This patch is against linux-next tree.

Quoted 3 lines

I've applied it to my ux500 branch and will carry it unless Will Deacon express an interest in it, PMU is his territory...

Thanks,
Axel

Will Deacon

2012-09-03 13:38 UTC #3 lore raw

In reply to Linus Walleij

Quoted 12 lines · Linus Walleij

Quoted 10 lines · Axel Lin
Include asm/pmu.h to fix below build error:
CC arch/arm/mach-ux500/cpu-db8500.o
arch/arm/mach-ux500/cpu-db8500.c:118:8: error: variable 'db8500_pmu_platdata' has initializer but incomplete type arch/arm/mach-ux500/cpu-db8500.c:119:2: error: unknown field 'handle_irq' specified in initializer arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: excess elements in struct initializer [enabled by default] arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: (near initialization for 'db8500_pmu_platdata') [enabled by default] make[1]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2

Quoted 6 lines

Quoted 1 line
Signed-off-by Axel Lin <[email protected]>
That's on linux-next not on v3.6-rcN right?
I've applied it to my ux500 branch and will carry it unless Will Deacon express an interest in it, PMU is his territory...

I've already sent a pull for those patches, so please can you carry the fixup? u8500 is the only platform using the arm_pmu_platdata at the moment so it has to keep the include.

Cheers,

Will

Linus Walleij

2012-09-03 14:17 UTC #4 lore raw

Quoted 15 lines · Will Deacon

Quoted 14 lines · Linus Walleij
Quoted 11 lines · Axel Lin
Include asm/pmu.h to fix below build error:
CC arch/arm/mach-ux500/cpu-db8500.o
arch/arm/mach-ux500/cpu-db8500.c:118:8: error: variable 'db8500_pmu_platdata' has initializer but incomplete type arch/arm/mach-ux500/cpu-db8500.c:119:2: error: unknown field 'handle_irq' specified in initializer arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: excess elements in struct initializer [enabled by default] arch/arm/mach-ux500/cpu-db8500.c:119:2: warning: (near initialization for 'db8500_pmu_platdata') [enabled by default] make[1]: *** [arch/arm/mach-ux500/cpu-db8500.o] Error 1
make: *** [arch/arm/mach-ux500] Error 2
Signed-off-by Axel Lin <[email protected]>

Quoted 8 lines

Quoted 4 lines
That's on linux-next not on v3.6-rcN right?
I've applied it to my ux500 branch and will carry it unless Will Deacon express an interest in it, PMU is his territory...
I've already sent a pull for those patches, so please can you carry the fixup? u8500 is the only platform using the arm_pmu_platdata at the moment so it has to keep the include.

OK I'll take it...

Yours,
Linus Walleij