* linux-next: build failure after merge of the Linus' tree
@ 2011-03-25 1:35 Stephen Rothwell
2011-03-25 13:56 ` Jarod Wilson
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-03-25 1:35 UTC (permalink / raw)
To: Linus, Andrew Morton
Cc: linux-next, linux-kernel, Akinobu Mita, Mauro Carvalho Chehab,
Juan J. Garcia de Soria, Jarod Wilson
Hi all,
In Linus' tree, today's linux-next build (x86_64 allmodconfig) failed
like this:
drivers/media/rc/ite-cir.c: In function 'ite_decode_bytes':
drivers/media/rc/ite-cir.c:190: error: implicit declaration of function 'generic_find_next_le_bit'
drivers/media/rc/ite-cir.c:199: error: implicit declaration of function 'generic_find_next_zero_le_bit'
Caused by commit 620a32bba4a2 ("[media] rc: New rc-based ite-cir driver
for several ITE CIRs") interacting with commit c4945b9ed472
("asm-generic: rename generic little-endian bitops functions").
I applied the patch below for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 25 Mar 2011 12:30:05 +1100
Subject: [PATCH] [media] rc: update for bitop name changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/media/rc/ite-cir.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index 9be6a83..ac0e42b 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -187,7 +187,7 @@ static void ite_decode_bytes(struct ite_dev *dev, const u8 * data, int
sample_period = dev->params.sample_period;
ldata = (unsigned long *)data;
size = length << 3;
- next_one = generic_find_next_le_bit(ldata, size, 0);
+ next_one = find_next_bit_le(ldata, size, 0);
if (next_one > 0) {
ev.pulse = true;
ev.duration =
@@ -196,14 +196,14 @@ static void ite_decode_bytes(struct ite_dev *dev, const u8 * data, int
}
while (next_one < size) {
- next_zero = generic_find_next_zero_le_bit(ldata, size, next_one + 1);
+ next_zero = find_next_zero_bit_le(ldata, size, next_one + 1);
ev.pulse = false;
ev.duration = ITE_BITS_TO_NS(next_zero - next_one, sample_period);
ir_raw_event_store_with_filter(dev->rdev, &ev);
if (next_zero < size) {
next_one =
- generic_find_next_le_bit(ldata,
+ find_next_bit_le(ldata,
size,
next_zero + 1);
ev.pulse = true;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the Linus' tree
2011-03-25 1:35 linux-next: build failure after merge of the Linus' tree Stephen Rothwell
@ 2011-03-25 13:56 ` Jarod Wilson
0 siblings, 0 replies; 6+ messages in thread
From: Jarod Wilson @ 2011-03-25 13:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus, Andrew Morton, linux-next, linux-kernel, Akinobu Mita,
Mauro Carvalho Chehab, Juan J. Garcia de Soria
On Fri, Mar 25, 2011 at 12:35:35PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> In Linus' tree, today's linux-next build (x86_64 allmodconfig) failed
> like this:
>
> drivers/media/rc/ite-cir.c: In function 'ite_decode_bytes':
> drivers/media/rc/ite-cir.c:190: error: implicit declaration of function 'generic_find_next_le_bit'
> drivers/media/rc/ite-cir.c:199: error: implicit declaration of function 'generic_find_next_zero_le_bit'
>
> Caused by commit 620a32bba4a2 ("[media] rc: New rc-based ite-cir driver
> for several ITE CIRs") interacting with commit c4945b9ed472
> ("asm-generic: rename generic little-endian bitops functions").
>
> I applied the patch below for today.
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 25 Mar 2011 12:30:05 +1100
> Subject: [PATCH] [media] rc: update for bitop name changes
Thanks Stephen, obviously the correct thing to do here.
Acked-by: Jarod Wilson <jarod@redhat.com>
--
Jarod Wilson
jarod@redhat.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the Linus' tree
2011-03-30 0:00 Stephen Rothwell
@ 2011-03-30 1:57 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Herrenschmidt @ 2011-03-30 1:57 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus, Thomas Gleixner, linux-next, ppc-dev, linux-kernel
On Wed, 2011-03-30 at 11:00 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the Linus' tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> arch/powerpc/platforms/cell/interrupt.c: In function 'iic_host_map':
> arch/powerpc/platforms/cell/interrupt.c:247: error: 'handle_iic_irq' undeclared (first use in this function)
There's a fix in powerpc "merge" for which I'm about to send Linus a
pull request :-)
Cheers,
Ben.
> Caused by commit f9ba4475f95b ("powerpc: cell: Use the core flow handler").
>
> I applied the following patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 30 Mar 2011 10:48:28 +1100
> Subject: [PATCH] powerpc/cell: fixup for removal of handle_iic_irq
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> arch/powerpc/platforms/cell/interrupt.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
> index a19bec0..44cfd1b 100644
> --- a/arch/powerpc/platforms/cell/interrupt.c
> +++ b/arch/powerpc/platforms/cell/interrupt.c
> @@ -244,7 +244,7 @@ static int iic_host_map(struct irq_host *h, unsigned int virq,
> break;
> case IIC_IRQ_TYPE_IOEXC:
> irq_set_chip_and_handler(virq, &iic_ioexc_chip,
> - handle_iic_irq);
> + handle_edge_eoi_irq);
> break;
> default:
> irq_set_chip_and_handler(virq, &iic_chip, handle_edge_eoi_irq);
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build failure after merge of the Linus' tree
2011-03-30 0:00 Stephen Rothwell
@ 2011-03-30 1:56 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 6+ messages in thread
From: Benjamin Herrenschmidt @ 2011-03-30 1:56 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Linus, Thomas Gleixner, linux-next, ppc-dev, linux-kernel
On Wed, 2011-03-30 at 11:00 +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the Linus' tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> kernel/irq/chip.c: In function 'handle_edge_eoi_irq':
> kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used
> kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined
There's a fix in tip/irq/urgent ...
Cheers,
Ben.
> Caused by commit 0521c8fbb3da ("genirq: Provide edge_eoi flow handler")
> which was clearly not even built with CONFIG_IRQ_EDGE_EOI_HANDLER defined.
>
> I applied this fixup patch:
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 30 Mar 2011 10:55:12 +1100
> Subject: [PATCH] genirq: fix CONFIG_IRQ_EDGE_EOI_HANDLER build
>
> Fixes these errors:
>
> kernel/irq/chip.c: In function 'handle_edge_eoi_irq':
> kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used
> kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> kernel/irq/chip.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
> index 616ec1c..1dafc86 100644
> --- a/kernel/irq/chip.c
> +++ b/kernel/irq/chip.c
> @@ -514,7 +514,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
> } while ((desc->istate & IRQS_PENDING) &&
> !irqd_irq_disabled(&desc->irq_data));
>
> -out_unlock:
> +out_eoi:
> chip->irq_eoi(&desc->irq_data);
> raw_spin_unlock(&desc->lock);
> }
> --
> 1.7.4.1
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the Linus' tree
@ 2011-03-30 0:00 Stephen Rothwell
2011-03-30 1:57 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-03-30 0:00 UTC (permalink / raw)
To: Linus; +Cc: linux-next, linux-kernel, Thomas Gleixner, ppc-dev
Hi all,
After merging the Linus' tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
arch/powerpc/platforms/cell/interrupt.c: In function 'iic_host_map':
arch/powerpc/platforms/cell/interrupt.c:247: error: 'handle_iic_irq' undeclared (first use in this function)
Caused by commit f9ba4475f95b ("powerpc: cell: Use the core flow handler").
I applied the following patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Mar 2011 10:48:28 +1100
Subject: [PATCH] powerpc/cell: fixup for removal of handle_iic_irq
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
arch/powerpc/platforms/cell/interrupt.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/platforms/cell/interrupt.c b/arch/powerpc/platforms/cell/interrupt.c
index a19bec0..44cfd1b 100644
--- a/arch/powerpc/platforms/cell/interrupt.c
+++ b/arch/powerpc/platforms/cell/interrupt.c
@@ -244,7 +244,7 @@ static int iic_host_map(struct irq_host *h, unsigned int virq,
break;
case IIC_IRQ_TYPE_IOEXC:
irq_set_chip_and_handler(virq, &iic_ioexc_chip,
- handle_iic_irq);
+ handle_edge_eoi_irq);
break;
default:
irq_set_chip_and_handler(virq, &iic_chip, handle_edge_eoi_irq);
--
1.7.4.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
* linux-next: build failure after merge of the Linus' tree
@ 2011-03-30 0:00 Stephen Rothwell
2011-03-30 1:56 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-03-30 0:00 UTC (permalink / raw)
To: Linus; +Cc: linux-next, linux-kernel, Thomas Gleixner, ppc-dev
Hi all,
After merging the Linus' tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:
kernel/irq/chip.c: In function 'handle_edge_eoi_irq':
kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used
kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined
Caused by commit 0521c8fbb3da ("genirq: Provide edge_eoi flow handler")
which was clearly not even built with CONFIG_IRQ_EDGE_EOI_HANDLER defined.
I applied this fixup patch:
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Mar 2011 10:55:12 +1100
Subject: [PATCH] genirq: fix CONFIG_IRQ_EDGE_EOI_HANDLER build
Fixes these errors:
kernel/irq/chip.c: In function 'handle_edge_eoi_irq':
kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used
kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
kernel/irq/chip.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 616ec1c..1dafc86 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -514,7 +514,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
} while ((desc->istate & IRQS_PENDING) &&
!irqd_irq_disabled(&desc->irq_data));
-out_unlock:
+out_eoi:
chip->irq_eoi(&desc->irq_data);
raw_spin_unlock(&desc->lock);
}
--
1.7.4.1
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-30 1:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-25 1:35 linux-next: build failure after merge of the Linus' tree Stephen Rothwell
2011-03-25 13:56 ` Jarod Wilson
2011-03-30 0:00 Stephen Rothwell
2011-03-30 1:56 ` Benjamin Herrenschmidt
2011-03-30 0:00 Stephen Rothwell
2011-03-30 1:57 ` Benjamin Herrenschmidt
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).