* [PATCH] x86: Stop including <linux/delay.h> in two asm header files
@ 2011-03-25 14:20 Jean Delvare
2011-03-29 9:16 ` [tip:x86/urgent] " tip-bot for Jean Delvare
0 siblings, 1 reply; 2+ messages in thread
From: Jean Delvare @ 2011-03-25 14:20 UTC (permalink / raw)
To: LKML, Andrew Morton
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86,
James E.J. Bottomley, Geert Uytterhoeven, Stephen Rothwell
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>
---
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(-)
--- linux-2.6.39-rc0.orig/arch/x86/include/asm/apic.h 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/include/asm/apic.h 2011-03-25 14:37:06.000000000 +0100
@@ -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>
--- linux-2.6.39-rc0.orig/arch/x86/include/asm/dma.h 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/include/asm/dma.h 2011-03-25 14:37:06.000000000 +0100
@@ -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
--- linux-2.6.39-rc0.orig/arch/x86/kernel/apic/hw_nmi.c 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/kernel/apic/hw_nmi.c 2011-03-25 14:37:07.000000000 +0100
@@ -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)
--- linux-2.6.39-rc0.orig/arch/x86/kernel/apic/x2apic_uv_x.c 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/kernel/apic/x2apic_uv_x.c 2011-03-25 14:37:07.000000000 +0100
@@ -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>
--- linux-2.6.39-rc0.orig/arch/x86/kernel/irq.c 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/kernel/irq.c 2011-03-25 14:37:07.000000000 +0100
@@ -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>
--- linux-2.6.39-rc0.orig/arch/x86/kernel/reboot.c 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/kernel/reboot.c 2011-03-25 14:37:07.000000000 +0100
@@ -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>
--- linux-2.6.39-rc0.orig/arch/x86/platform/uv/tlb_uv.c 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/arch/x86/platform/uv/tlb_uv.c 2011-03-25 14:37:07.000000000 +0100
@@ -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>
--- linux-2.6.39-rc0.orig/drivers/scsi/ultrastor.c 2011-03-25 14:15:01.000000000 +0100
+++ linux-2.6.39-rc0/drivers/scsi/ultrastor.c 2011-03-25 14:37:07.000000000 +0100
@@ -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>
--- linux-2.6.39-rc0.orig/drivers/media/rc/ite-cir.c 2011-03-25 13:54:59.000000000 +0100
+++ linux-2.6.39-rc0/drivers/media/rc/ite-cir.c 2011-03-25 14:56:15.000000000 +0100
@@ -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"
--
Jean Delvare
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86: Stop including <linux/delay.h> in two asm header files
2011-03-25 14:20 [PATCH] x86: Stop including <linux/delay.h> in two asm header files Jean Delvare
@ 2011-03-29 9:16 ` tip-bot for Jean Delvare
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Jean Delvare @ 2011-03-29 9:16 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, James.Bottomley, hpa, mingo, geert, khali, tglx,
sfr, mingo
Commit-ID: ca444564a947034557a85357b3911d067cac4b8f
Gitweb: http://git.kernel.org/tip/ca444564a947034557a85357b3911d067cac4b8f
Author: Jean Delvare <khali@linux-fr.org>
AuthorDate: Fri, 25 Mar 2011 15:20:14 +0100
Committer: Ingo Molnar <mingo@elte.hu>
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 <khali@linux-fr.org>
Cc: James E.J. Bottomley <James.Bottomley@suse.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
LKML-Reference: <20110325152014.297890ec@endymion.delvare>
[ this also fixes an upstream build bug in drivers/media/rc/ite-cir.c ]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
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(-)
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index a279d98..2b7d573 100644
--- 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>
diff --git a/arch/x86/include/asm/dma.h b/arch/x86/include/asm/dma.h
index 97b6d81..057099e 100644
--- 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
diff --git a/arch/x86/kernel/apic/hw_nmi.c b/arch/x86/kernel/apic/hw_nmi.c
index c4e557a..5260fe9 100644
--- 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)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index 3c28928..d2cf39b 100644
--- 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>
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 948a31e..1cb0b9f 100644
--- 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>
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index d3ce37e..08c44b0 100644
--- 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>
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index a7b38d3..7cb6424 100644
--- 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>
diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c
index ac0e42b..accaf6c 100644
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
@@ -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"
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 0571ef9..9f4b58b 100644
--- 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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-29 9:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-25 14:20 [PATCH] x86: Stop including <linux/delay.h> in two asm header files Jean Delvare
2011-03-29 9:16 ` [tip:x86/urgent] " tip-bot for Jean Delvare
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome