* [2.6 patch] x86_64: remove duplicate includes
@ 2004-12-14 1:10 Adrian Bunk
2005-01-17 9:29 ` [discuss] " Andi Kleen
0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2004-12-14 1:10 UTC (permalink / raw)
To: ak; +Cc: discuss, linux-kernel
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [discuss] [2.6 patch] x86_64: remove duplicate includes
2004-12-14 1:10 [2.6 patch] x86_64: remove duplicate includes Adrian Bunk
@ 2005-01-17 9:29 ` Andi Kleen
0 siblings, 0 replies; 2+ messages in thread
From: Andi Kleen @ 2005-01-17 9:29 UTC (permalink / raw)
To: Adrian Bunk; +Cc: ak, discuss, linux-kernel
On Tue, Dec 14, 2004 at 02:10:30AM +0100, Adrian Bunk wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-01-17 9:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-12-14 1:10 [2.6 patch] x86_64: remove duplicate includes Adrian Bunk
2005-01-17 9:29 ` [discuss] " Andi Kleen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).