linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 524 bytes --]

Hi all,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/hwmon/sch5627.c: In function 'sch5627_read_virtual_reg':
drivers/hwmon/sch5627.c:179: error: implicit declaration of function 'msleep'

Caused by commit 19803daeb145 ("hwmon: New driver for SMSC SCH5627").
See Rule 1 in Documentation/SubmitChecklist.

I have reverted that commit for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Hans de Goede]

[-- Attachment #1: Type: text/plain, Size: 674 bytes --]

Hi,

On 03/15/2011 09:24 AM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
>
> drivers/hwmon/sch5627.c: In function 'sch5627_read_virtual_reg':
> drivers/hwmon/sch5627.c:179: error: implicit declaration of function 'msleep'
>
> Caused by commit 19803daeb145 ("hwmon: New driver for SMSC SCH5627").
> See Rule 1 in Documentation/SubmitChecklist.
>
> I have reverted that commit for today.

The attached patch should fix this, Jean can you please add this to your
tree? Note feel free to merge it into the initial patch adding the sch5627 driver
if you prefer.

Thanks & Regards,

Hans

[-- Attachment #2: 0001-hwmon-sch5627-include-linux-delay.h-for-msleep-proto.patch --]
[-- Type: text/plain, Size: 799 bytes --]

>From a5ffc5ddcdb230fcb10fe6c80ebe043c25763416 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Tue, 15 Mar 2011 09:37:47 +0100
Subject: [PATCH] hwmon/sch5627: include linux/delay.h for msleep prototype

This should fix sch5627 breaking the building of linux-next

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/hwmon/sch5627.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/hwmon/sch5627.c b/drivers/hwmon/sch5627.c
index 0001331..9a51dcc 100644
--- a/drivers/hwmon/sch5627.c
+++ b/drivers/hwmon/sch5627.c
@@ -30,6 +30,7 @@
 #include <linux/mutex.h>
 #include <linux/io.h>
 #include <linux/acpi.h>
+#include <linux/delay.h>
 
 #define DRVNAME "sch5627"
 #define DEVNAME DRVNAME /* We only support one model */
-- 
1.7.3.2

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Jean Delvare]

On Tue, 15 Mar 2011 09:40:41 +0100, Hans de Goede wrote:
> Hi,
> 
> On 03/15/2011 09:24 AM, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the final tree, today's linux-next build (powerpc
> > allyesconfig) failed like this:
> >
> > drivers/hwmon/sch5627.c: In function 'sch5627_read_virtual_reg':
> > drivers/hwmon/sch5627.c:179: error: implicit declaration of function 'msleep'
> >
> > Caused by commit 19803daeb145 ("hwmon: New driver for SMSC SCH5627").
> > See Rule 1 in Documentation/SubmitChecklist.
> >
> > I have reverted that commit for today.
> 
> The attached patch should fix this, Jean can you please add this to your
> tree? Note feel free to merge it into the initial patch adding the sch5627 driver
> if you prefer.

Thanks for the fix, I've merged it in the original patch (to preserve
bisectability) and pushed it for next linux-next.

Stephen, sorry for the inconvenience, both Hans and myself build-tested
the new code on an architecture where <linux/delay.h> gets included
implicitly, so we didn't notice it was missing.

-- 
Jean Delvare

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 599 bytes --]

Hi Jean,

On Tue, 15 Mar 2011 10:32:28 +0100 Jean Delvare <khali@linux-fr.org> wrote:
>
> Stephen, sorry for the inconvenience, both Hans and myself build-tested
> the new code on an architecture where <linux/delay.h> gets included
> implicitly, so we didn't notice it was missing.

It happens.  It seems that delay.h is almost always the one that is
forgotten.  X86 builds include it implicitly but powerpc doesn't.

I wonder if we could concoct a nice checkpatch test for it.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Jean Delvare]

On Tue, 15 Mar 2011 21:22:26 +1100, Stephen Rothwell wrote:
> Hi Jean,
> 
> On Tue, 15 Mar 2011 10:32:28 +0100 Jean Delvare <khali@linux-fr.org> wrote:
> >
> > Stephen, sorry for the inconvenience, both Hans and myself build-tested
> > the new code on an architecture where <linux/delay.h> gets included
> > implicitly, so we didn't notice it was missing.
> 
> It happens.  It seems that delay.h is almost always the one that is
> forgotten.  X86 builds include it implicitly but powerpc doesn't.
> 
> I wonder if we could concoct a nice checkpatch test for it.

Would certainly be a good idea, yes. Probably not trivial though.

-- 
Jean Delvare

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Geert Uytterhoeven]

On Tue, Mar 15, 2011 at 11:22, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> On Tue, 15 Mar 2011 10:32:28 +0100 Jean Delvare <khali@linux-fr.org> wrote:
>> Stephen, sorry for the inconvenience, both Hans and myself build-tested
>> the new code on an architecture where <linux/delay.h> gets included
>> implicitly, so we didn't notice it was missing.
>
> It happens.  It seems that delay.h is almost always the one that is
> forgotten.  X86 builds include it implicitly but powerpc doesn't.
>
> I wonder if we could concoct a nice checkpatch test for it.

Or remove the implicit includes on x86...

$ git grep delay\\.h arch/x86/include/
arch/x86/include/asm/apic.h:#include <linux/delay.h>
arch/x86/include/asm/dma.h:#include <linux/delay.h>
arch/x86/include/asm/i8259.h:#include <linux/delay.h>
$

At first sight, apic.h and dmah.h don't seem to need it.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Jean Delvare]

On Thu, 17 Mar 2011 13:18:00 +0100, Geert Uytterhoeven wrote:
> On Tue, Mar 15, 2011 at 11:22, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > On Tue, 15 Mar 2011 10:32:28 +0100 Jean Delvare <khali@linux-fr.org> wrote:
> >> Stephen, sorry for the inconvenience, both Hans and myself build-tested
> >> the new code on an architecture where <linux/delay.h> gets included
> >> implicitly, so we didn't notice it was missing.
> >
> > It happens.  It seems that delay.h is almost always the one that is
> > forgotten.  X86 builds include it implicitly but powerpc doesn't.
> >
> > I wonder if we could concoct a nice checkpatch test for it.
> 
> Or remove the implicit includes on x86...
> 
> $ git grep delay\\.h arch/x86/include/
> arch/x86/include/asm/apic.h:#include <linux/delay.h>
> arch/x86/include/asm/dma.h:#include <linux/delay.h>
> arch/x86/include/asm/i8259.h:#include <linux/delay.h>
> $
> 
> At first sight, apic.h and dmah.h don't seem to need it.

Something like this?

* * * * *

Stop including <linux/delay.h> in x86 header files which don't need
it. This will let the compiler complain when this header is not
included by source files when it should, so that contributors can fix
the problem before building on other architectures starts to fail.

Credits go to Geert for the idea.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/x86/include/asm/apic.h        |    1 -
 arch/x86/include/asm/dma.h         |    1 -
 arch/x86/kernel/apic/hw_nmi.c      |    1 +
 arch/x86/kernel/apic/x2apic_uv_x.c |    1 +
 arch/x86/kernel/irq.c              |    1 +
 arch/x86/kernel/reboot.c           |    1 +
 arch/x86/platform/uv/tlb_uv.c      |    1 +
 drivers/scsi/ultrastor.c           |    1 +
 8 files changed, 6 insertions(+), 2 deletions(-)

--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -2,7 +2,6 @@
 #define _ASM_X86_APIC_H
 
 #include <linux/cpumask.h>
-#include <linux/delay.h>
 #include <linux/pm.h>
 
 #include <asm/alternative.h>
--- a/arch/x86/include/asm/dma.h
+++ b/arch/x86/include/asm/dma.h
@@ -10,7 +10,6 @@
 
 #include <linux/spinlock.h>	/* And spinlocks */
 #include <asm/io.h>		/* need byte IO */
-#include <linux/delay.h>
 
 #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER
 #define dma_outb	outb_p
--- a/arch/x86/kernel/apic/hw_nmi.c
+++ b/arch/x86/kernel/apic/hw_nmi.c
@@ -16,6 +16,7 @@
 #include <linux/kprobes.h>
 #include <linux/nmi.h>
 #include <linux/module.h>
+#include <linux/delay.h>
 
 #ifdef CONFIG_HARDLOCKUP_DETECTOR
 u64 hw_nmi_get_sample_period(void)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -23,6 +23,7 @@
 #include <linux/io.h>
 #include <linux/pci.h>
 #include <linux/kdebug.h>
+#include <linux/delay.h>
 
 #include <asm/uv/uv_mmrs.h>
 #include <asm/uv/uv_hub.h>
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -8,6 +8,7 @@
 #include <linux/seq_file.h>
 #include <linux/smp.h>
 #include <linux/ftrace.h>
+#include <linux/delay.h>
 
 #include <asm/apic.h>
 #include <asm/io_apic.h>
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -6,6 +6,7 @@
 #include <linux/dmi.h>
 #include <linux/sched.h>
 #include <linux/tboot.h>
+#include <linux/delay.h>
 #include <acpi/reboot.h>
 #include <asm/io.h>
 #include <asm/apic.h>
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -11,6 +11,7 @@
 #include <linux/debugfs.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
+#include <linux/delay.h>
 
 #include <asm/mmu_context.h>
 #include <asm/uv/uv.h>
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -138,6 +138,7 @@
 #include <linux/spinlock.h>
 #include <linux/stat.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/system.h>


-- 
Jean Delvare

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Randy Dunlap]

On Tue, 15 Mar 2011 19:24:28 +1100 Stephen Rothwell wrote:

> Hi all,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/hwmon/sch5627.c: In function 'sch5627_read_virtual_reg':
> drivers/hwmon/sch5627.c:179: error: implicit declaration of function 'msleep'
> 
> Caused by commit 19803daeb145 ("hwmon: New driver for SMSC SCH5627").
> See Rule 1 in Documentation/SubmitChecklist.
> 
> I have reverted that commit for today.


linux-next-20110316/drivers/i2c/busses/i2c-designware-core.c:321: error: implicit declaration of function 'mdelay'

linux-next-20110316/drivers/staging/altera-stapl/altera-jtag.c:398: error: implicit declaration of function 'udelay'

patch has been posted for altera-jtag.c, but not merged.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 759 bytes --]

Hi ,

After merging the final tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/hwmon/pcf8591.c: In function 'pcf8591_probe':
drivers/hwmon/pcf8591.c:205: error: implicit declaration of function 'IS_ERR'
drivers/hwmon/pcf8591.c:206: error: implicit declaration of function 'PTR_ERR'

Caused by commit 63575f5628b811d80f81158825dbc9d3db4ac1a5 ("hwmon:
(pcf8591) Register as a hwmon device").

See Rule 1 in Documentation/SubmitChecklist.

I have added reverted that commit (and
3eabb87a17ff8da477f7bf4c5a14063b68937fb1 ("hwmon: (pcf8591) Don't attempt
to detect devices") that followed it) for today.


-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related)

[Jean Delvare]

Hi Stephen,

On Wed, 6 Oct 2010 15:28:31 +1100, Stephen Rothwell wrote:
> Hi ,
> 
> After merging the final tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/hwmon/pcf8591.c: In function 'pcf8591_probe':
> drivers/hwmon/pcf8591.c:205: error: implicit declaration of function 'IS_ERR'
> drivers/hwmon/pcf8591.c:206: error: implicit declaration of function 'PTR_ERR'
> 
> Caused by commit 63575f5628b811d80f81158825dbc9d3db4ac1a5 ("hwmon:
> (pcf8591) Register as a hwmon device").

Oh, right. Missing include, thanks for the heads up.

> See Rule 1 in Documentation/SubmitChecklist.

True, shame on me :(

> I have added reverted that commit (and
> 3eabb87a17ff8da477f7bf4c5a14063b68937fb1 ("hwmon: (pcf8591) Don't attempt
> to detect devices") that followed it) for today.

Fixed by now.

-- 
Jean Delvare