From: Adrian Bunk <bunk@stusta.de>
To: ak@suse.de
Cc: discuss@x86-64.org, linux-kernel@vger.kernel.org
Subject: [2.6 patch] x86_64: remove duplicate includes
Date: Tue, 14 Dec 2004 02:10:30 +0100 [thread overview]
Message-ID: <20041214011030.GT23151@stusta.de> (raw)
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 <bunk@stusta.de>
--- linux-2.6.9-mm1-full/arch/x86_64/kernel/entry.S.old 2004-10-22 21:37:32.000000000 +0200
+++ linux-2.6.9-mm1-full/arch/x86_64/kernel/entry.S 2004-10-22 21:50:19.000000000 +0200
@@ -41,7 +41,6 @@
#include <asm/unistd.h>
#include <asm/thread_info.h>
#include <asm/hw_irq.h>
-#include <asm/errno.h>
.code64
--- linux-2.6.9-mm1-full/arch/x86_64/kernel/module.c.old 2004-10-22 21:37:32.000000000 +0200
+++ linux-2.6.9-mm1-full/arch/x86_64/kernel/module.c 2004-10-22 21:50:24.000000000 +0200
@@ -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>
--- linux-2.6.9-mm1-full/arch/x86_64/kernel/setup.c.old 2004-10-22 21:37:32.000000000 +0200
+++ linux-2.6.9-mm1-full/arch/x86_64/kernel/setup.c 2004-10-22 21:50:31.000000000 +0200
@@ -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>
--- linux-2.6.9-mm1-full/arch/x86_64/kernel/time.c.old 2004-10-22 21:37:32.000000000 +0200
+++ linux-2.6.9-mm1-full/arch/x86_64/kernel/time.c 2004-10-22 21:50:57.000000000 +0200
@@ -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);
--- linux-2.6.9-mm1-full/arch/x86_64/kernel/x8664_ksyms.c.old 2004-10-22 21:37:32.000000000 +0200
+++ linux-2.6.9-mm1-full/arch/x86_64/kernel/x8664_ksyms.c 2004-10-22 21:51:04.000000000 +0200
@@ -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;
--- linux-2.6.9-mm1-full/include/asm-x86_64/pci.h.old 2004-10-22 21:37:34.000000000 +0200
+++ linux-2.6.9-mm1-full/include/asm-x86_64/pci.h 2004-10-22 22:00:25.000000000 +0200
@@ -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);
next reply other threads:[~2004-12-14 1:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-12-14 1:10 Adrian Bunk [this message]
2005-01-17 9:29 ` [discuss] [2.6 patch] x86_64: remove duplicate includes Andi Kleen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20041214011030.GT23151@stusta.de \
--to=bunk@stusta.de \
--cc=ak@suse.de \
--cc=discuss@x86-64.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.