Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca444564 authored by Jean Delvare's avatar Jean Delvare Committed by Ingo Molnar
Browse files

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: default avatarJean 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: default avatarIngo Molnar <mingo@elte.hu>
parent 89078d57

arch/x86/include/asm/apic.h

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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>