From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: Re: linux-next: build failure after merge of the final tree (jdelvare-hwmon tree related) Date: Thu, 17 Mar 2011 16:36:21 +0100 Message-ID: <20110317163621.2a546644@endymion.delvare> References: <20110315192428.ce74a177.sfr@canb.auug.org.au> <4D7F2609.3080508@redhat.com> <20110315103228.30233acc@endymion.delvare> <20110315212226.7e940b51.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from zone0.gcu-squad.org ([212.85.147.21]:32201 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754065Ab1CQPgi convert rfc822-to-8bit (ORCPT ); Thu, 17 Mar 2011 11:36:38 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Geert Uytterhoeven Cc: Stephen Rothwell , Hans de Goede , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On Thu, 17 Mar 2011 13:18:00 +0100, Geert Uytterhoeven wrote: > On Tue, Mar 15, 2011 at 11:22, Stephen Rothwell wrote: > > On Tue, 15 Mar 2011 10:32:28 +0100 Jean Delvare wrote: > >> Stephen, sorry for the inconvenience, both Hans and myself build-t= ested > >> the new code on an architecture where gets include= d > >> implicitly, so we didn't notice it was missing. > > > > It happens. =A0It seems that delay.h is almost always the one that = is > > forgotten. =A0X86 builds include it implicitly but powerpc doesn't. > > > > I wonder if we could concoct a nice checkpatch test for it. >=20 > Or remove the implicit includes on x86... >=20 > $ git grep delay\\.h arch/x86/include/ > arch/x86/include/asm/apic.h:#include > arch/x86/include/asm/dma.h:#include > arch/x86/include/asm/i8259.h:#include > $ >=20 > At first sight, apic.h and dmah.h don't seem to need it. Something like this? * * * * * Stop including 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 Cc: Geert Uytterhoeven Cc: Stephen Rothwell --- 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 =20 #include -#include #include =20 #include --- a/arch/x86/include/asm/dma.h +++ b/arch/x86/include/asm/dma.h @@ -10,7 +10,6 @@ =20 #include /* And spinlocks */ #include /* need byte IO */ -#include =20 #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 #include #include +#include =20 #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 #include #include +#include =20 #include #include --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -8,6 +8,7 @@ #include #include #include +#include =20 #include #include --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #include #include --- a/drivers/scsi/ultrastor.c +++ b/drivers/scsi/ultrastor.c @@ -138,6 +138,7 @@ #include #include #include +#include =20 #include #include --=20 Jean Delvare