From: "Cousson, Benoit" <b-cousson@ti.com>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: Tony Lindgren <tony@atomide.com>,
"Kristo, Tero" <t-kristo@ti.com>,
"linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH] ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error
Date: Thu, 9 Feb 2012 21:05:57 +0100 [thread overview]
Message-ID: <4F342725.5050704@ti.com> (raw)
In-Reply-To: <20120209191547.GD19159@n2100.arm.linux.org.uk>
On 2/9/2012 8:15 PM, Russell King - ARM Linux wrote:
> On Thu, Feb 09, 2012 at 08:01:09PM +0100, Cousson, Benoit wrote:
>> If CONFIG_OF is not defined, the following error will happen.
>>
>> arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error:
>> ‘INT_34XX_PRCM_MPU_IRQ’ undeclared here (not in a function)
>>
>> This is due to some hidden headers path from linux/of.h to plat/irqs.h
>> already reported by Russell for prm4xxx.c.
>
> I have the following commit from mainline. I suspect you have an old
> tree.
OK, it was part of the fixes Tony sent for for v3.3-rc2 but that are
were not in mainline until now.
I've just pulled -rc3 and this is indeed there.
Thanks,
Benoit
>
> Note: for the next merge window, I'm removing the asm/irq.h include from
> asm/prom.h so that this kind of thing doesn't happen in the future.
>
> commit d19e8f2e44a34b2a461f67ce9d0cb5bd43197c1e
> Author: Paul Walmsley<paul@pwsan.com>
> Date: Wed Jan 25 12:57:49 2012 -0700
>
> ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
>
> Commit 22f51371f8c35869ed850f46aa76b6cc2b502110 ("ARM: OMAP3: pm: use
> prcm chain handler") breaks the build on a 2420-only config, due to
> a missing include for plat/irqs.h:
>
> CC arch/arm/mach-omap2/prm2xxx_3xxx.o
> arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error: 'INT_34XX_PRCM_MPU_IRQ' undeclared here (not in a function)
>
> Fix by explicitly including it.
>
> Signed-off-by: Paul Walmsley<paul@pwsan.com>
> Cc: Tero Kristo<t-kristo@ti.com>
> Cc: Kevin Hilman<khilman@ti.com>
>
> diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c
> index c1c4d86..9ce7654 100644
> --- a/arch/arm/mach-omap2/prm2xxx_3xxx.c
> +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c
> @@ -19,6 +19,7 @@
> #include "common.h"
> #include<plat/cpu.h>
> #include<plat/prcm.h>
> +#include<plat/irqs.h>
>
> #include "vp.h"
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: b-cousson@ti.com (Cousson, Benoit)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error
Date: Thu, 9 Feb 2012 21:05:57 +0100 [thread overview]
Message-ID: <4F342725.5050704@ti.com> (raw)
In-Reply-To: <20120209191547.GD19159@n2100.arm.linux.org.uk>
On 2/9/2012 8:15 PM, Russell King - ARM Linux wrote:
> On Thu, Feb 09, 2012 at 08:01:09PM +0100, Cousson, Benoit wrote:
>> If CONFIG_OF is not defined, the following error will happen.
>>
>> arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error:
>> ?INT_34XX_PRCM_MPU_IRQ? undeclared here (not in a function)
>>
>> This is due to some hidden headers path from linux/of.h to plat/irqs.h
>> already reported by Russell for prm4xxx.c.
>
> I have the following commit from mainline. I suspect you have an old
> tree.
OK, it was part of the fixes Tony sent for for v3.3-rc2 but that are
were not in mainline until now.
I've just pulled -rc3 and this is indeed there.
Thanks,
Benoit
>
> Note: for the next merge window, I'm removing the asm/irq.h include from
> asm/prom.h so that this kind of thing doesn't happen in the future.
>
> commit d19e8f2e44a34b2a461f67ce9d0cb5bd43197c1e
> Author: Paul Walmsley<paul@pwsan.com>
> Date: Wed Jan 25 12:57:49 2012 -0700
>
> ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
>
> Commit 22f51371f8c35869ed850f46aa76b6cc2b502110 ("ARM: OMAP3: pm: use
> prcm chain handler") breaks the build on a 2420-only config, due to
> a missing include for plat/irqs.h:
>
> CC arch/arm/mach-omap2/prm2xxx_3xxx.o
> arch/arm/mach-omap2/prm2xxx_3xxx.c:41:11: error: 'INT_34XX_PRCM_MPU_IRQ' undeclared here (not in a function)
>
> Fix by explicitly including it.
>
> Signed-off-by: Paul Walmsley<paul@pwsan.com>
> Cc: Tero Kristo<t-kristo@ti.com>
> Cc: Kevin Hilman<khilman@ti.com>
>
> diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c
> index c1c4d86..9ce7654 100644
> --- a/arch/arm/mach-omap2/prm2xxx_3xxx.c
> +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c
> @@ -19,6 +19,7 @@
> #include "common.h"
> #include<plat/cpu.h>
> #include<plat/prcm.h>
> +#include<plat/irqs.h>
>
> #include "vp.h"
>
next prev parent reply other threads:[~2012-02-09 20:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 19:01 [PATCH] ARM: OMAP2+: Fix prm2xxx_3xxx.c INT_34XX_PRCM_MPU_IRQ build error Cousson, Benoit
2012-02-09 19:01 ` Cousson, Benoit
2012-02-09 19:15 ` Russell King - ARM Linux
2012-02-09 19:15 ` Russell King - ARM Linux
2012-02-09 20:05 ` Cousson, Benoit [this message]
2012-02-09 20:05 ` Cousson, Benoit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F342725.5050704@ti.com \
--to=b-cousson@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=t-kristo@ti.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.