Skip to contentSkip to conversation

ARM: fix builds due to missing <asm/system_misc.h> includes

PATCH New Olof Johansson 5 participants 5 messages Mar 30, 2012 – Apr 2, 2012

Subsystems (6)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape Arm/Microchip (AT91) SoC support +2 more subsystems
lore
Share & tools
lore

Olof Johansson

author
#0 lore raw

PATCH 1/2 ARM: fix builds due to missing <asm/system_misc.h> includes

This does a sweeping change fixing up all the missing system_misc.h and system_info.h includes from the system.h split-up change. These were the ones I came across when building all defconfigs in arch/arm/configs, there might be more but they lack adequate build coverage to be easily caught.

I'm expecting to get a lot of these piecemeal by each maintainer, so we might just as well do one sweeping change to get them all at once.

Cc Nicolas Ferre <[email protected]>
Cc Russell King <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Imre Kaloz <[email protected]>
Cc Krzysztof Halasa <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc Kukjin Kim <[email protected]>
Signed-off-by Olof Johansson <[email protected]>
---
 arch/arm/mach-at91/at91x40.c  |    1 +
 arch/arm/mach-at91/setup.c    |    1 +
 arch/arm/mach-h720x/common.c  |    1 +
 arch/arm/mach-imx/mm-imx3.c   |    1 +
 arch/arm/mach-imx/mm-imx5.c   |    1 +
 arch/arm/mach-ixp23xx/core.c  |    1 +
 arch/arm/mach-ixp4xx/common.c |    1 +
 arch/arm/mach-pxa/raumfeld.c  |    2 ++
 arch/arm/mach-shark/core.c    |    1 +
 arch/arm/mach-w90x900/dev.c   |    1 +
 arch/arm/plat-s3c24xx/cpu.c   |    1 +
 11 files changed, 12 insertions(+)
arch/arm/mach-at91/at91x40.c +1 -0
index 5400a1d..d62fe09 100644
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/proc-fns.h>
+#include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <mach/at91x40.h>
 #include <mach/at91_st.h>
arch/arm/mach-at91/setup.c +1 -0
index 1083739..97cc04d 100644
@@ -11,6 +11,7 @@
 #include <linux/pm.h>
 #include <linux/of_address.h>
 
+#include <asm/system_misc.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
arch/arm/mach-h720x/common.c +1 -0
index e756d1a..aa1331e 100644
@@ -24,6 +24,7 @@
 #include <asm/dma.h>
 #include <mach/hardware.h>
 #include <asm/irq.h>
+#include <asm/system_misc.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 #include <mach/irqs.h>
arch/arm/mach-imx/mm-imx3.c +1 -0
index d534d7f..7412738 100644
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 
 #include <asm/pgtable.h>
+#include <asm/system_misc.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/map.h>
arch/arm/mach-imx/mm-imx5.c +1 -0
index 51af9fa..05250ae 100644
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 
+#include <asm/system_misc.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
arch/arm/mach-ixp23xx/core.c +1 -0
index d2c2dc3..d345424 100644
@@ -36,6 +36,7 @@
 #include <asm/irq.h>
 #include <asm/tlbflush.h>
 #include <asm/pgtable.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
arch/arm/mach-ixp4xx/common.c +1 -0
index c60e7b8..ebbd7fc 100644
@@ -37,6 +37,7 @@
 #include <asm/page.h>
 #include <asm/irq.h>
 #include <asm/sched_clock.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
arch/arm/mach-pxa/raumfeld.c +2 -0
index 7d691e5..5905ed1 100644
@@ -43,6 +43,8 @@
 #include <linux/regulator/consumer.h>
 #include <linux/delay.h>
 
+#include <asm/system_info.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-shark/core.c +1 -0
index 6a2a7f2..2704bcd 100644
@@ -15,6 +15,7 @@
 #include <asm/mach-types.h>
 #include <asm/leds.h>
 #include <asm/param.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
arch/arm/mach-w90x900/dev.c +1 -0
index db82568..48f5b9f 100644
@@ -27,6 +27,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 
+#include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
arch/arm/plat-s3c24xx/cpu.c +1 -0
index 0db73ae..290942d 100644
@@ -36,6 +36,7 @@
 #include <asm/irq.h>
 #include <asm/cacheflush.h>
 #include <asm/system_info.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
Signature · 1 line
1.7.9.2.359.gebfc2
#1 lore raw

PATCH 1/2 ARM: fix builds due to missing <asm/system_misc.h> includes

Quoted 9 lines · Olof Johansson

This does a sweeping change fixing up all the missing system_misc.h and system_info.h includes from the system.h split-up change. These were the ones I came across when building all defconfigs in arch/arm/configs, there might be more but they lack adequate build coverage to be easily caught.

I'm expecting to get a lot of these piecemeal by each maintainer, so we might just as well do one sweeping change to get them all at once.

Quoted 9 lines
Cc Nicolas Ferre<[email protected]>
Cc Russell King<[email protected]>
Cc Sascha Hauer<[email protected]>
Cc Imre Kaloz<[email protected]>
Cc Krzysztof Halasa<[email protected]>
Cc Eric Miao<[email protected]>
Cc Haojian Zhuang<[email protected]>
Cc Wan ZongShun<[email protected]>
Cc Kukjin Kim<[email protected]>
Acked-by Kukjin Kim <[email protected]>

Thansk, this fixes following:

arch/arm/plat-s3c24xx/cpu.c: In function 's3c24xx_init_io':
arch/arm/plat-s3c24xx/cpu.c:221: error: 'arm_pm_idle' undeclared (first use in this function)
arch/arm/plat-s3c24xx/cpu.c:221: error: (Each undeclared identifier is reported only once
arch/arm/plat-s3c24xx/cpu.c:221: error: for each function it appears in.) make[2]: *** [arch/arm/plat-s3c24xx/cpu.o] Error 1
make[2]: *** Waiting for unfinished jobs....

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

Quoted 14 lines
Signed-off-by Olof Johansson<[email protected]>
---
  arch/arm/mach-at91/at91x40.c  |    1 +
  arch/arm/mach-at91/setup.c    |    1 +
  arch/arm/mach-h720x/common.c  |    1 +
  arch/arm/mach-imx/mm-imx3.c   |    1 +
  arch/arm/mach-imx/mm-imx5.c   |    1 +
  arch/arm/mach-ixp23xx/core.c  |    1 +
  arch/arm/mach-ixp4xx/common.c |    1 +
  arch/arm/mach-pxa/raumfeld.c  |    2 ++
  arch/arm/mach-shark/core.c    |    1 +
  arch/arm/mach-w90x900/dev.c   |    1 +
  arch/arm/plat-s3c24xx/cpu.c   |    1 +
  11 files changed, 12 insertions(+)

[...]

#2 lore raw

PATCH 1/2 ARM: fix builds due to missing <asm/system_misc.h> includes

In reply to Olof Johansson

2012/3/30 Olof Johansson <[email protected]>:

Quoted 8 lines

This does a sweeping change fixing up all the missing system_misc.h and system_info.h includes from the system.h split-up change. These were the ones I came across when building all defconfigs in arch/arm/configs, there might be more but they lack adequate build coverage to be easily caught.

I'm expecting to get a lot of these piecemeal by each maintainer, so we might just as well do one sweeping change to get them all at once.

For Winbond/Nuvoton w90x900 platform,

Acked-by Wan ZongShun <[email protected]>
Quoted 161 lines
Cc Nicolas Ferre <[email protected]>
Cc Russell King <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Imre Kaloz <[email protected]>
Cc Krzysztof Halasa <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc Kukjin Kim <[email protected]>
Signed-off-by Olof Johansson <[email protected]>

---

?arch/arm/mach-at91/at91x40.c ?| ? ?1 +
?arch/arm/mach-at91/setup.c ? ?| ? ?1 +
?arch/arm/mach-h720x/common.c ?| ? ?1 +
?arch/arm/mach-imx/mm-imx3.c ? | ? ?1 +
?arch/arm/mach-imx/mm-imx5.c ? | ? ?1 +
?arch/arm/mach-ixp23xx/core.c ?| ? ?1 +
?arch/arm/mach-ixp4xx/common.c | ? ?1 +
?arch/arm/mach-pxa/raumfeld.c ?| ? ?2 ++
?arch/arm/mach-shark/core.c ? ?| ? ?1 +
?arch/arm/mach-w90x900/dev.c ? | ? ?1 +
?arch/arm/plat-s3c24xx/cpu.c ? | ? ?1 +

?11 files changed, 12 insertions(+)

arch/arm/mach-at91/at91x40.c +0 -0
index 5400a1d..d62fe09 100644
@@ -14,6 +14,7 @@

?#include <linux/init.h>
?#include <linux/irq.h>
?#include <asm/proc-fns.h>
+#include <asm/system_misc.h>
?#include <asm/mach/arch.h>
?#include <mach/at91x40.h>
?#include <mach/at91_st.h>

arch/arm/mach-at91/setup.c +0 -0
index 1083739..97cc04d 100644
@@ -11,6 +11,7 @@

?#include <linux/pm.h>
?#include <linux/of_address.h>

+#include <asm/system_misc.h>
?#include <asm/mach/map.h>

?#include <mach/hardware.h>

arch/arm/mach-h720x/common.c +0 -0
index e756d1a..aa1331e 100644
@@ -24,6 +24,7 @@

?#include <asm/dma.h>
?#include <mach/hardware.h>
?#include <asm/irq.h>
+#include <asm/system_misc.h>
?#include <asm/mach/irq.h>
?#include <asm/mach/map.h>
?#include <mach/irqs.h>

arch/arm/mach-imx/mm-imx3.c +0 -0
index d534d7f..7412738 100644
@@ -21,6 +21,7 @@

?#include <linux/err.h>

?#include <asm/pgtable.h>
+#include <asm/system_misc.h>
?#include <asm/hardware/cache-l2x0.h>
?#include <asm/mach/map.h>

arch/arm/mach-imx/mm-imx5.c +0 -0
index 51af9fa..05250ae 100644
@@ -15,6 +15,7 @@

?#include <linux/init.h>
?#include <linux/clk.h>

+#include <asm/system_misc.h>
?#include <asm/mach/map.h>

?#include <mach/hardware.h>

arch/arm/mach-ixp23xx/core.c +0 -0
index d2c2dc3..d345424 100644
@@ -36,6 +36,7 @@

?#include <asm/irq.h>
?#include <asm/tlbflush.h>
?#include <asm/pgtable.h>
+#include <asm/system_misc.h>

?#include <asm/mach/map.h>
?#include <asm/mach/time.h>

arch/arm/mach-ixp4xx/common.c +0 -0
index c60e7b8..ebbd7fc 100644
@@ -37,6 +37,7 @@

?#include <asm/page.h>
?#include <asm/irq.h>
?#include <asm/sched_clock.h>
+#include <asm/system_misc.h>

?#include <asm/mach/map.h>
?#include <asm/mach/irq.h>

arch/arm/mach-pxa/raumfeld.c +0 -0
index 7d691e5..5905ed1 100644
@@ -43,6 +43,8 @@

?#include <linux/regulator/consumer.h>
?#include <linux/delay.h>

arch/arm/mach-pxa/raumfeld.c +2 -0
+#include <asm/system_info.h>
+

?#include <asm/mach-types.h>
?#include <asm/mach/arch.h>

arch/arm/mach-shark/core.c +0 -0
index 6a2a7f2..2704bcd 100644
@@ -15,6 +15,7 @@

?#include <asm/mach-types.h>
?#include <asm/leds.h>
?#include <asm/param.h>
+#include <asm/system_misc.h>

?#include <asm/mach/map.h>
?#include <asm/mach/arch.h>

arch/arm/mach-w90x900/dev.c +0 -0
index db82568..48f5b9f 100644
@@ -27,6 +27,7 @@

?#include <linux/spi/spi.h>
?#include <linux/spi/flash.h>

+#include <asm/system_misc.h>
?#include <asm/mach/arch.h>
?#include <asm/mach/map.h>
?#include <asm/mach/irq.h>

arch/arm/plat-s3c24xx/cpu.c +0 -0
index 0db73ae..290942d 100644
@@ -36,6 +36,7 @@

?#include <asm/irq.h>
?#include <asm/cacheflush.h>
?#include <asm/system_info.h>
+#include <asm/system_misc.h>

?#include <asm/mach/arch.h>
?#include <asm/mach/map.h>
--
1.7.9.2.359.gebfc2

Signature · 2 lines
Wan ZongShun.
www.mcuos.com
#3 lore raw

PATCH 1/2 ARM: fix builds due to missing <asm/system_misc.h> includes

In reply to Olof Johansson
Quoted 20 lines · Olof Johansson

This does a sweeping change fixing up all the missing system_misc.h and system_info.h includes from the system.h split-up change. These were the ones I came across when building all defconfigs in arch/arm/configs, there might be more but they lack adequate build coverage to be easily caught.

I'm expecting to get a lot of these piecemeal by each maintainer, so we might just as well do one sweeping change to get them all at once.

Cc Nicolas Ferre <[email protected]>
Cc Russell King <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Imre Kaloz <[email protected]>
Cc Krzysztof Halasa <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc Kukjin Kim <[email protected]>
Signed-off-by Olof Johansson <[email protected]>

---

...

Quoted 2 lines
 arch/arm/mach-imx/mm-imx3.c   |    1 +
 arch/arm/mach-imx/mm-imx5.c   |    1 +

The changes are same as the patch below that I sent a little earlier.

ARM: imx: fix ?arm_pm_idle? undeclared error

So,

Acked-by Shawn Guo <[email protected]>
Signature · 2 lines
Regards,
Shawn
#4 lore raw

PATCH 1/2 ARM: fix builds due to missing <asm/system_misc.h> includes

In reply to Olof Johansson

On 03/30/2012 04:38 PM, Olof Johansson :

Quoted 10 lines

This does a sweeping change fixing up all the missing system_misc.h and system_info.h includes from the system.h split-up change. These were the ones I came across when building all defconfigs in arch/arm/configs, there might be more but they lack adequate build coverage to be easily caught.

I'm expecting to get a lot of these piecemeal by each maintainer, so we might just as well do one sweeping change to get them all at once.

Cc Nicolas Ferre <[email protected]>

Olof,

Even if it is a bit too late:

Acked-by Nicolas Ferre <[email protected]>

It replaces the previously sent patch:
(ARM: at91: include newly created system_misc.h file).

Thanks a lot for taking care of this.

Cheers,

Quoted 156 lines
Cc Russell King <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Imre Kaloz <[email protected]>
Cc Krzysztof Halasa <[email protected]>
Cc Eric Miao <[email protected]>
Cc Haojian Zhuang <[email protected]>
Cc Wan ZongShun <[email protected]>
Cc Kukjin Kim <[email protected]>
Signed-off-by Olof Johansson <[email protected]>
---
 arch/arm/mach-at91/at91x40.c  |    1 +
 arch/arm/mach-at91/setup.c    |    1 +
 arch/arm/mach-h720x/common.c  |    1 +
 arch/arm/mach-imx/mm-imx3.c   |    1 +
 arch/arm/mach-imx/mm-imx5.c   |    1 +
 arch/arm/mach-ixp23xx/core.c  |    1 +
 arch/arm/mach-ixp4xx/common.c |    1 +
 arch/arm/mach-pxa/raumfeld.c  |    2 ++
 arch/arm/mach-shark/core.c    |    1 +
 arch/arm/mach-w90x900/dev.c   |    1 +
 arch/arm/plat-s3c24xx/cpu.c   |    1 +
 11 files changed, 12 insertions(+)
arch/arm/mach-at91/at91x40.c +1 -0
index 5400a1d..d62fe09 100644
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/proc-fns.h>
+#include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <mach/at91x40.h>
 #include <mach/at91_st.h>
arch/arm/mach-at91/setup.c +1 -0
index 1083739..97cc04d 100644
@@ -11,6 +11,7 @@
 #include <linux/pm.h>
 #include <linux/of_address.h>
 
+#include <asm/system_misc.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
arch/arm/mach-h720x/common.c +1 -0
index e756d1a..aa1331e 100644
@@ -24,6 +24,7 @@
 #include <asm/dma.h>
 #include <mach/hardware.h>
 #include <asm/irq.h>
+#include <asm/system_misc.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 #include <mach/irqs.h>
arch/arm/mach-imx/mm-imx3.c +1 -0
index d534d7f..7412738 100644
@@ -21,6 +21,7 @@
 #include <linux/err.h>
 
 #include <asm/pgtable.h>
+#include <asm/system_misc.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/map.h>
arch/arm/mach-imx/mm-imx5.c +1 -0
index 51af9fa..05250ae 100644
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/clk.h>
 
+#include <asm/system_misc.h>
 #include <asm/mach/map.h>
 
 #include <mach/hardware.h>
arch/arm/mach-ixp23xx/core.c +1 -0
index d2c2dc3..d345424 100644
@@ -36,6 +36,7 @@
 #include <asm/irq.h>
 #include <asm/tlbflush.h>
 #include <asm/pgtable.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
arch/arm/mach-ixp4xx/common.c +1 -0
index c60e7b8..ebbd7fc 100644
@@ -37,6 +37,7 @@
 #include <asm/page.h>
 #include <asm/irq.h>
 #include <asm/sched_clock.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
arch/arm/mach-pxa/raumfeld.c +2 -0
index 7d691e5..5905ed1 100644
@@ -43,6 +43,8 @@
 #include <linux/regulator/consumer.h>
 #include <linux/delay.h>
 
+#include <asm/system_info.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
arch/arm/mach-shark/core.c +1 -0
index 6a2a7f2..2704bcd 100644
@@ -15,6 +15,7 @@
 #include <asm/mach-types.h>
 #include <asm/leds.h>
 #include <asm/param.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/map.h>
 #include <asm/mach/arch.h>
arch/arm/mach-w90x900/dev.c +1 -0
index db82568..48f5b9f 100644
@@ -27,6 +27,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 
+#include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
arch/arm/plat-s3c24xx/cpu.c +1 -0
index 0db73ae..290942d 100644
@@ -36,6 +36,7 @@
 #include <asm/irq.h>
 #include <asm/cacheflush.h>
 #include <asm/system_info.h>
+#include <asm/system_misc.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
Signature · 1 line
Nicolas Ferre