Patchwork arm/imx: add missing include of asm/exception.h for avic.c

login
register
mail settings
Submitter Shawn Guo
Date Oct. 21, 2011, 2:33 a.m.
Message ID <1319164380-23517-1-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/120925/
State New
Headers show

Comments

Shawn Guo - Oct. 21, 2011, 2:33 a.m.
It adds missing include of asm/exception.h for avic.c to fix the
compile error below.

  arch/arm/plat-mxc/avic.c:154:39: error: expected ‘=’, ‘,’, ‘;’,
  ‘asm’ or ‘__attribute__’ before ‘avic_handle_irq’

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
Arnd,

I hit this error when building imx6q on your for-next branch.

 arch/arm/plat-mxc/avic.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Uwe Kleine-König - Oct. 21, 2011, 7:22 a.m.
Hello,


On Fri, Oct 21, 2011 at 10:33:00AM +0800, Shawn Guo wrote:
> It adds missing include of asm/exception.h for avic.c to fix the
> compile error below.
> 
>   arch/arm/plat-mxc/avic.c:154:39: error: expected ‘=’, ‘,’, ‘;’,
>   ‘asm’ or ‘__attribute__’ before ‘avic_handle_irq’
> 
> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Arnd already posted a patch for that[1], but this one looks better.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Best regards
Uwe

[1] http://mid.gmane.org/1928841.IC5oQhqc6l@wuerfel
Arnd Bergmann - Oct. 21, 2011, 4:38 p.m.
On Friday 21 October 2011 09:22:19 Uwe Kleine-König wrote:
> 
> On Fri, Oct 21, 2011 at 10:33:00AM +0800, Shawn Guo wrote:
> > It adds missing include of asm/exception.h for avic.c to fix the
> > compile error below.
> > 
> >   arch/arm/plat-mxc/avic.c:154:39: error: expected ‘=’, ‘,’, ‘;’,
> >   ‘asm’ or ‘__attribute__’ before ‘avic_handle_irq’
> > 
> > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> Arnd already posted a patch for that[1], but this one looks better.
> 
> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Ok, thanks!

I found the same problem in plat-mxc/tzic.c as well now.

Which branch should we apply the patch to? The header file was
introduced in rmk's smp branch, but the usage was introduced in
the imx/multi-irq branch.

Should I merge the smp branch into imx/multi-irq and fix up the
breakage in the merge commit?

	Arnd
Sascha Hauer - Oct. 21, 2011, 6:07 p.m.
On Fri, Oct 21, 2011 at 06:38:32PM +0200, Arnd Bergmann wrote:
> On Friday 21 October 2011 09:22:19 Uwe Kleine-König wrote:
> > 
> > On Fri, Oct 21, 2011 at 10:33:00AM +0800, Shawn Guo wrote:
> > > It adds missing include of asm/exception.h for avic.c to fix the
> > > compile error below.
> > > 
> > >   arch/arm/plat-mxc/avic.c:154:39: error: expected ‘=’, ‘,’, ‘;’,
> > >   ‘asm’ or ‘__attribute__’ before ‘avic_handle_irq’
> > > 
> > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
> > Arnd already posted a patch for that[1], but this one looks better.
> > 
> > Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Ok, thanks!
> 
> I found the same problem in plat-mxc/tzic.c as well now.
> 
> Which branch should we apply the patch to? The header file was
> introduced in rmk's smp branch, but the usage was introduced in
> the imx/multi-irq branch.
> 
> Should I merge the smp branch into imx/multi-irq and fix up the
> breakage in the merge commit?

Ok, this one is already found. Putting it into the merge commit sounds
good.

Sascha

Patch

diff --git a/arch/arm/plat-mxc/avic.c b/arch/arm/plat-mxc/avic.c
index 8875fb4..3157691 100644
--- a/arch/arm/plat-mxc/avic.c
+++ b/arch/arm/plat-mxc/avic.c
@@ -21,6 +21,7 @@ 
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <mach/common.h>
+#include <asm/exception.h>
 #include <asm/mach/irq.h>
 #include <mach/hardware.h>