x86: Stop including <linux/delay.h> in two asm header files
Subsystems (5)
PATCH 1/1 x86: Stop including <linux/delay.h> in two asm header files
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 <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>
---
As discussed on linux-next.
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/media/rc/ite-cir.c | 1 + drivers/scsi/ultrastor.c | 1 + 9 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/include/asm/apic.h +0 -1
@@ -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>
arch/x86/include/asm/dma.h +0 -1
@@ -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
arch/x86/kernel/apic/hw_nmi.c +1 -0
@@ -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 )
arch/x86/kernel/apic/x2apic_uv_x.c +1 -0
@@ -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>
arch/x86/kernel/irq.c +1 -0
@@ -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>
arch/x86/kernel/reboot.c +1 -0
@@ -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>
arch/x86/platform/uv/tlb_uv.c +1 -0
@@ -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>
drivers/scsi/ultrastor.c +1 -0
@@ -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>
drivers/media/rc/ite-cir.c +1 -0
@@ -41,6 +41,7 @@#include <linux/bitops.h> #include <media/rc-core.h> #include <linux/pci_ids.h> +#include <linux/delay.h> #include "ite-cir.h"
Signature · 1 line
Jean Delvare
Commit-ID: ca444564a947034557a85357b3911d067cac4b8f Gitweb: http://git.kernel.org/tip/ca444564a947034557a85357b3911d067cac4b8f Author: Jean Delvare <[email protected]> AuthorDate: Fri, 25 Mar 2011 15:20:14 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 29 Mar 2011 09:37:42 +0200
x86: Stop including <linux/delay.h> in two asm header files
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 <[email protected]>
Cc James E.J. Bottomley <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>
LKML-Reference: <[email protected]>
[ this also fixes an upstream build bug in drivers/media/rc/ite-cir.c ]
Signed-off-by Ingo Molnar <[email protected]>
--- 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/media/rc/ite-cir.c | 1 + drivers/scsi/ultrastor.c | 1 + 9 files changed, 7 insertions(+), 2 deletions(-)
arch/x86/include/asm/apic.h +0 -1
@@ -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>
arch/x86/include/asm/dma.h +0 -1
@@ -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
arch/x86/kernel/apic/hw_nmi.c +1 -0
@@ -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 )
arch/x86/kernel/apic/x2apic_uv_x.c +1 -0
@@ -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>
arch/x86/kernel/irq.c +1 -0
@@ -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>
arch/x86/kernel/reboot.c +1 -0
@@ -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>
arch/x86/platform/uv/tlb_uv.c +1 -0
@@ -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>
drivers/media/rc/ite-cir.c +1 -0
@@ -41,6 +41,7 @@#include <linux/bitops.h> #include <media/rc-core.h> #include <linux/pci_ids.h> +#include <linux/delay.h> #include "ite-cir.h"
drivers/scsi/ultrastor.c +1 -0
@@ -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>