linux-next: build failure after merge of the mfd tree
in [Kernel]
|
Prev: [RESEND -v2][PATCH 3/3] mem-hotplug: fix potential race while building zonelist for new populated zone
Next: perf: record does not seem to store buildids anymore
From: Stephen Rothwell on 19 May 2010 00:10 Hi Samuel, After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove': drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags' Caused by commit 16548223daf6b3b95b75cb961d772831a754e126 ("mfd: new AB8500 driver"). I have used the mfd tree from next-20100518 for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Rabin VINCENT on 19 May 2010 00:30 On Wed, May 19, 2010 at 06:03:10 +0200, Stephen Rothwell wrote: > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove': > drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags' > > Caused by commit 16548223daf6b3b95b75cb961d772831a754e126 ("mfd: new > AB8500 driver"). Oops, one of the calls to set_irq_flags() is missing a CONFIG_ARM. The patch below should fix it. Thanks. From 39368228513c8b429daa274362e7bfe80598b366 Mon Sep 17 00:00:00 2001 From: Rabin Vincent <rabin.vincent(a)stericsson.com> Date: Wed, 19 May 2010 09:41:56 +0530 Subject: [PATCH] mfd: ab8500: fix build on !ARM Add a missing CONFIG_ARM around one of the calls to set_irq_flags(), to prevent these errors on other archs: drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove': drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags' Acked-by: Linus Walleij <linus.walleij(a)stericsson.com> Signed-off-by: Rabin Vincent <rabin.vincent(a)stericsson.com> --- drivers/mfd/ab8500-core.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c index e93833f..f3d26fa 100644 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd/ab8500-core.c @@ -299,7 +299,9 @@ static void ab8500_irq_remove(struct ab8500 *ab8500) int irq; for (irq = base; irq < base + AB8500_NR_IRQS; irq++) { +#ifdef CONFIG_ARM set_irq_flags(irq, 0); +#endif set_irq_chip_and_handler(irq, NULL, NULL); set_irq_chip_data(irq, NULL); } -- 1.7.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Samuel Ortiz on 19 May 2010 06:00 Hi Rabin, On Wed, May 19, 2010 at 09:53:35AM +0530, Rabin VINCENT wrote: > On Wed, May 19, 2010 at 06:03:10 +0200, Stephen Rothwell wrote: > > After merging the mfd tree, today's linux-next build (x86_64 allmodconfig) > > failed like this: > > > > drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove': > > drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags' > > > > Caused by commit 16548223daf6b3b95b75cb961d772831a754e126 ("mfd: new > > AB8500 driver"). > > Oops, one of the calls to set_irq_flags() is missing a CONFIG_ARM. The > patch below should fix it. Thanks. Patch merged with the main ab8500 one, thanks for the quick fix. Stephen, this is pushed and the mfd tree should be fine now. Cheers, Samuel. > From 39368228513c8b429daa274362e7bfe80598b366 Mon Sep 17 00:00:00 2001 > From: Rabin Vincent <rabin.vincent(a)stericsson.com> > Date: Wed, 19 May 2010 09:41:56 +0530 > Subject: [PATCH] mfd: ab8500: fix build on !ARM > > Add a missing CONFIG_ARM around one of the calls to set_irq_flags(), to > prevent these errors on other archs: > > drivers/mfd/ab8500-core.c: In function 'ab8500_irq_remove': > drivers/mfd/ab8500-core.c:302: error: implicit declaration of function 'set_irq_flags' > > Acked-by: Linus Walleij <linus.walleij(a)stericsson.com> > Signed-off-by: Rabin Vincent <rabin.vincent(a)stericsson.com> > --- > drivers/mfd/ab8500-core.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c > index e93833f..f3d26fa 100644 > --- a/drivers/mfd/ab8500-core.c > +++ b/drivers/mfd/ab8500-core.c > @@ -299,7 +299,9 @@ static void ab8500_irq_remove(struct ab8500 *ab8500) > int irq; > > for (irq = base; irq < base + AB8500_NR_IRQS; irq++) { > +#ifdef CONFIG_ARM > set_irq_flags(irq, 0); > +#endif > set_irq_chip_and_handler(irq, NULL, NULL); > set_irq_chip_data(irq, NULL); > } > -- > 1.7.0 > -- Intel Open Source Technology Centre http://oss.intel.com/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 19 May 2010 10:20
Hi Samuel, Rabin, On Wed, 19 May 2010 11:57:20 +0200 Samuel Ortiz <sameo(a)linux.intel.com> wrote: > > Patch merged with the main ab8500 one, thanks for the quick fix. > Stephen, this is pushed and the mfd tree should be fine now. Thanks guys. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |