Skip to contentSkip to conversation

x86_64: remove duplicate includes

PATCH Applied Adrian Bunk 2 participants 2 messages Dec 14, 2004 – Jan 17, 2005

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 x86_64: remove duplicate includes

There's usually no reason for including the same header file twice.

The patch below removes such duplicate includes in x86_64 specific files.

diffstat output:

 arch/x86_64/kernel/entry.S       |    1 -
 arch/x86_64/kernel/module.c      |    1 -
 arch/x86_64/kernel/setup.c       |    1 -
 arch/x86_64/kernel/time.c        |    1 -
 arch/x86_64/kernel/x8664_ksyms.c |    1 -
 include/asm-x86_64/pci.h         |    1 -
 6 files changed, 6 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
arch/x86_64/kernel/entry.S renamed from arch/x86_64/kernel/entry.S.old +0 -1
@@ -41,7 +41,6 @@
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
 #include <asm/hw_irq.h>
-#include <asm/errno.h>
 
 	.code64
arch/x86_64/kernel/module.c renamed from arch/x86_64/kernel/module.c.old +0 -1
@@ -23,7 +23,6 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/vmalloc.h>
 
 #include <asm/system.h>
 #include <asm/page.h>
arch/x86_64/kernel/setup.c renamed from arch/x86_64/kernel/setup.c.old +0 -1
@@ -53,7 +53,6 @@
 #include <asm/mpspec.h>
 #include <asm/mmu_context.h>
 #include <asm/bootsetup.h>
-#include <asm/smp.h>
 #include <asm/proto.h>
 #include <asm/setup.h>
arch/x86_64/kernel/time.c renamed from arch/x86_64/kernel/time.c.old +0 -1
@@ -1000,7 +1000,6 @@
  * For (3), we use interrupts at 64Hz or user specified periodic
  * frequency, whichever is higher.
  */
-#include <linux/mc146818rtc.h>
 #include <linux/rtc.h>
 
 extern irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs);
arch/x86_64/kernel/x8664_ksyms.c renamed from arch/x86_64/kernel/x8664_ksyms.c.old +0 -1
@@ -30,7 +30,6 @@
 #include <asm/nmi.h>
 #include <asm/kdebug.h>
 #include <asm/unistd.h>
-#include <asm/delay.h>
 #include <asm/tlbflush.h>
 
 extern spinlock_t rtc_lock;
include/asm-x86_64/pci.h renamed from include/asm-x86_64/pci.h.old +0 -1
@@ -41,7 +41,6 @@
 #include <linux/slab.h>
 #include <asm/scatterlist.h>
 #include <linux/string.h>
-#include <asm/io.h>
 #include <asm/page.h>
 
 extern int iommu_setup(char *opt);
Applied
#1 lore raw
Quoted 4 lines · Adrian Bunk

There's usually no reason for including the same header file twice.

The patch below removes such duplicate includes in x86_64 specific files.

Queued. Thanks.

-Andi