* [PATCH] ARM: prom.h: Fix build error by removing unneeded header file
@ 2012-01-02 16:19 Fabio Estevam
2012-01-04 8:07 ` Grant Likely
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2012-01-02 16:19 UTC (permalink / raw)
To: linux-arm-kernel
Fix the following build error:
CC [M] fs/udf/balloc.o
In file included from /home/fabio/next/linux-next/arch/arm/include/asm/prom.h:16,
from include/linux/of.h:140,
from include/asm-generic/gpio.h:7,
from arch/arm/plat-mxc/include/mach/irqs.h:14,
from /home/fabio/next/linux-next/arch/arm/include/asm/irq.h:4,
from /home/fabio/next/linux-next/arch/arm/include/asm/hardirq.h:6,
from include/linux/hardirq.h:7,
from include/linux/highmem.h:8,
from include/linux/pagemap.h:10,
from include/linux/buffer_head.h:13,
from fs/udf/udfdecl.h:11,
from fs/udf/balloc.c:22:
/home/fabio/next/linux-next/arch/arm/include/asm/setup.h:146: error: redefinition of 'struct tag'
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
This build error happens on linux-next by doing:
make imx_v6_v7_defconfig
make
arch/arm/include/asm/prom.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index 6f65ca8..ee03633 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -13,7 +13,6 @@
#ifdef CONFIG_OF
-#include <asm/setup.h>
#include <asm/irq.h>
extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
--
1.7.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM: prom.h: Fix build error by removing unneeded header file
2012-01-02 16:19 [PATCH] ARM: prom.h: Fix build error by removing unneeded header file Fabio Estevam
@ 2012-01-04 8:07 ` Grant Likely
2012-01-04 9:14 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Grant Likely @ 2012-01-04 8:07 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jan 02, 2012 at 02:19:03PM -0200, Fabio Estevam wrote:
> Fix the following build error:
>
> CC [M] fs/udf/balloc.o
> In file included from /home/fabio/next/linux-next/arch/arm/include/asm/prom.h:16,
> from include/linux/of.h:140,
> from include/asm-generic/gpio.h:7,
> from arch/arm/plat-mxc/include/mach/irqs.h:14,
> from /home/fabio/next/linux-next/arch/arm/include/asm/irq.h:4,
> from /home/fabio/next/linux-next/arch/arm/include/asm/hardirq.h:6,
> from include/linux/hardirq.h:7,
> from include/linux/highmem.h:8,
> from include/linux/pagemap.h:10,
> from include/linux/buffer_head.h:13,
> from fs/udf/udfdecl.h:11,
> from fs/udf/balloc.c:22:
> /home/fabio/next/linux-next/arch/arm/include/asm/setup.h:146: error: redefinition of 'struct tag'
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Well that's ugly. There are two definitions of struct tag. The patch
does fix the compile error, but it could easily reoccur. Ideally one
of the structures should be renamed.
Applied, thanks
g.
> ---
> This build error happens on linux-next by doing:
> make imx_v6_v7_defconfig
> make
>
> arch/arm/include/asm/prom.h | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
> index 6f65ca8..ee03633 100644
> --- a/arch/arm/include/asm/prom.h
> +++ b/arch/arm/include/asm/prom.h
> @@ -13,7 +13,6 @@
>
> #ifdef CONFIG_OF
>
> -#include <asm/setup.h>
> #include <asm/irq.h>
>
> extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
> --
> 1.7.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] ARM: prom.h: Fix build error by removing unneeded header file
2012-01-04 8:07 ` Grant Likely
@ 2012-01-04 9:14 ` Russell King - ARM Linux
0 siblings, 0 replies; 3+ messages in thread
From: Russell King - ARM Linux @ 2012-01-04 9:14 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 04, 2012 at 01:07:31AM -0700, Grant Likely wrote:
> On Mon, Jan 02, 2012 at 02:19:03PM -0200, Fabio Estevam wrote:
> > Fix the following build error:
> >
> > CC [M] fs/udf/balloc.o
> > In file included from /home/fabio/next/linux-next/arch/arm/include/asm/prom.h:16,
> > from include/linux/of.h:140,
> > from include/asm-generic/gpio.h:7,
> > from arch/arm/plat-mxc/include/mach/irqs.h:14,
> > from /home/fabio/next/linux-next/arch/arm/include/asm/irq.h:4,
> > from /home/fabio/next/linux-next/arch/arm/include/asm/hardirq.h:6,
> > from include/linux/hardirq.h:7,
> > from include/linux/highmem.h:8,
> > from include/linux/pagemap.h:10,
> > from include/linux/buffer_head.h:13,
> > from fs/udf/udfdecl.h:11,
> > from fs/udf/balloc.c:22:
> > /home/fabio/next/linux-next/arch/arm/include/asm/setup.h:146: error: redefinition of 'struct tag'
> >
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>
> Well that's ugly. There are two definitions of struct tag. The patch
> does fix the compile error, but it could easily reoccur. Ideally one
> of the structures should be renamed.
I'm not renaming the ARM one as it's an API thing which gets shared with
boot loaders. Changing that is likely to cause breakage outside the
kernel tree.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-04 9:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-02 16:19 [PATCH] ARM: prom.h: Fix build error by removing unneeded header file Fabio Estevam
2012-01-04 8:07 ` Grant Likely
2012-01-04 9:14 ` Russell King - ARM Linux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).