remove duplicate includes (fwd)
Subsystems (35)
PATCH 1/1 remove duplicate includes (fwd)
I ran "make includecheck" against 2.6.9-mm1 and went throught the results.
Below is a patch that removes in cases where a file is included directly twice in a file the second inclusion.
In all cases where the second inclusion might have had an effect I left it (famous last words: I didn't miss such a case.).
For better merging, this patch includes only the parts that also apply against Linus' tree.
This version s updated to include only the parts that apply against both 2.6.10-rc1 and 2.6.10-rc1-mm2.
diffstat output:
arch/alpha/kernel/setup.c | 1 - arch/arm/mach-iop3xx/common.c | 1 - arch/arm/mach-iop3xx/iop331-setup.c | 1 - arch/arm/mach-ixp2000/core.c | 2 -- arch/arm/mach-ixp2000/enp2611.c | 3 --- arch/arm/mach-ixp2000/ixdp2400.c | 3 --- arch/arm/mach-ixp2000/ixdp2800.c | 3 --- arch/arm/mach-ixp2000/ixdp2x00.c | 3 --- arch/arm/mach-ixp2000/ixdp2x01.c | 3 --- arch/arm/mach-ixp4xx/common-pci.c | 1 - arch/arm/mach-lh7a40x/arch-kev7a400.c | 1 - arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 1 - arch/arm26/kernel/ecard.c | 1 - arch/i386/kernel/cpuid.c | 1 - arch/i386/mach-voyager/voyager_smp.c | 1 - arch/ia64/kernel/time.c | 1 - arch/ia64/sn/kernel/setup.c | 1 - arch/ia64/sn/pci/pcibr/pcibr_dma.c | 1 - arch/m68k/q40/config.c | 1 - arch/mips/au1000/csb250/init.c | 1 - arch/mips/au1000/hydrogen3/init.c | 1 - arch/mips/au1000/mtx-1/init.c | 1 - arch/mips/mm/dma-coherent.c | 2 -- arch/mips/pci/pci-lasat.c | 2 -- arch/mips/pmc-sierra/yosemite/setup.c | 1 - arch/parisc/kernel/signal.c | 1 - arch/parisc/kernel/smp.c | 3 +-- arch/ppc/kernel/cpu_setup_6xx.S | 1 - arch/ppc/kernel/cpu_setup_power4.S | 1 - arch/ppc/syslib/gt64260_pic.c | 1 - arch/ppc/syslib/mpc52xx_pic.c | 1 - arch/ppc/xmon/start.c | 1 - arch/ppc64/kernel/btext.c | 1 - arch/ppc64/kernel/cpu_setup_power4.S | 1 - arch/ppc64/kernel/iSeries_setup.c | 1 - arch/ppc64/kernel/iommu.c | 1 - arch/ppc64/kernel/pSeries_lpar.c | 1 - arch/ppc64/mm/hugetlbpage.c | 3 --- arch/ppc64/mm/init.c | 1 - arch/sh/kernel/sh_ksyms.c | 1 - arch/sh64/kernel/process.c | 1 - arch/sh64/kernel/setup.c | 4 ---- arch/sh64/kernel/signal.c | 1 - arch/sh64/kernel/traps.c | 2 -- arch/sparc/kernel/irq.c | 1 - arch/sparc64/kernel/module.c | 1 - arch/sparc64/kernel/process.c | 1 - arch/sparc64/kernel/sys_sparc32.c | 1 - arch/sparc64/kernel/sys_sunos32.c | 1 - arch/sparc64/kernel/time.c | 1 - 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 - drivers/block/viodasd.c | 1 - drivers/char/amiserial.c | 1 - drivers/char/lcd.c | 1 - drivers/char/ppdev.c | 1 - drivers/char/synclink.c | 1 - drivers/cpufreq/cpufreq_ondemand.c | 1 - drivers/i2c/chips/rtc8564.c | 1 - drivers/input/gameport/vortex.c | 1 - drivers/macintosh/therm_pm72.c | 1 - drivers/media/video/arv.c | 1 - drivers/media/video/zr36016.c | 3 --- drivers/mtd/chips/jedec_probe.c | 1 - drivers/net/gianfar.h | 1 - drivers/net/gianfar_ethtool.c | 1 - drivers/net/mv643xx_eth.c | 1 - drivers/net/via-velocity.c | 1 - drivers/parisc/lasi.c | 1 - drivers/scsi/ibmmca.c | 1 - drivers/usb/serial/ipw.c | 1 - drivers/video/fbmem.c | 2 -- drivers/video/tgafb.c | 1 - drivers/w1/matrox_w1.c | 1 - include/asm-ia64/pgtable.h | 1 - include/asm-ia64/unistd.h | 1 - include/asm-m32r/mmu_context.h | 1 - include/asm-mips/mach-dec/mc146818rtc.h | 1 - include/asm-ppc64/elf.h | 1 - include/asm-sparc/system.h | 2 -- include/asm-x86_64/pci.h | 1 - include/linux/ipv6.h | 1 - include/linux/nfs_fs.h | 1 - kernel/profile.c | 1 - mm/mempolicy.c | 2 -- mm/swap.c | 2 -- mm/swapfile.c | 1 - net/atm/lec.c | 1 - net/ipv4/ip_output.c | 1 - net/ipv4/ipvs/ip_vs_ctl.c | 1 - net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 1 - net/ipv4/netfilter/ip_conntrack_proto_tcp.c | 1 - net/ipv4/netfilter/ip_conntrack_proto_udp.c | 1 - net/ipv6/tcp_ipv6.c | 1 - net/sched/police.c | 1 - net/sunrpc/auth_gss/svcauth_gss.c | 1 - net/wanrouter/wanmain.c | 1 - sound/oss/rme96xx.c | 1 - 101 files changed, 1 insertion(+), 127 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
arch/alpha/kernel/setup.c renamed from arch/alpha/kernel/setup.c.old +0 -1
@@ -55,7 +55,6 @@#include <asm/system.h> #include <asm/hwrpb.h> #include <asm/dma.h> -#include <asm/io.h> #include <asm/mmu_context.h> #include <asm/console.h>
arch/arm26/kernel/ecard.c renamed from arch/arm26/kernel/ecard.c.old +0 -1
@@ -44,7 +44,6 @@#include <asm/irq.h> #include <asm/pgalloc.h> #include <asm/mmu_context.h> -#include <asm/irq.h> #include <asm/irqchip.h> #include <asm/tlbflush.h>
arch/arm/mach-iop3xx/common.c renamed from arch/arm/mach-iop3xx/common.c.old +0 -1
@@ -28,7 +28,6 @@* Default power-off for EP80219 */ #include <asm/mach-types.h> -#include <asm/hardware.h> static inline void ep80219_send_to_pic (__u8 c) { }
arch/arm/mach-iop3xx/iop331-setup.c renamed from arch/arm/mach-iop3xx/iop331-setup.c.old +0 -1
@@ -12,7 +12,6 @@#include <linux/mm.h> #include <linux/init.h> #include <linux/config.h> -#include <linux/init.h> #include <linux/major.h> #include <linux/fs.h> #include <linux/device.h>
arch/arm/mach-ixp2000/core.c renamed from arch/arm/mach-ixp2000/core.c.old +0 -2
@@ -33,10 +33,8 @@#include <asm/mach-types.h> #include <asm/irq.h> #include <asm/system.h> -#include <asm/hardware.h> #include <asm/tlbflush.h> #include <asm/pgtable.h> -#include <asm/mach-types.h> #include <asm/mach/map.h> #include <asm/mach/time.h>
arch/arm/mach-ixp2000/enp2611.c renamed from arch/arm/mach-ixp2000/enp2611.c.old +0 -3
@@ -26,9 +26,6 @@#include <linux/interrupt.h> #include <linux/bitops.h> #include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/mm.h> -#include <linux/init.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/delay.h>
arch/arm/mach-ixp2000/ixdp2400.c renamed from arch/arm/mach-ixp2000/ixdp2400.c.old +0 -3
@@ -23,9 +23,6 @@#include <linux/device.h> #include <linux/bitops.h> #include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/mm.h> -#include <linux/init.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/delay.h>
arch/arm/mach-ixp2000/ixdp2800.c renamed from arch/arm/mach-ixp2000/ixdp2800.c.old +0 -3
@@ -23,9 +23,6 @@#include <linux/device.h> #include <linux/bitops.h> #include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/mm.h> -#include <linux/init.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/delay.h>
arch/arm/mach-ixp2000/ixdp2x00.c renamed from arch/arm/mach-ixp2000/ixdp2x00.c.old +0 -3
@@ -23,9 +23,6 @@#include <linux/device.h> #include <linux/bitops.h> #include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/mm.h> -#include <linux/init.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/delay.h>
arch/arm/mach-ixp2000/ixdp2x01.c renamed from arch/arm/mach-ixp2000/ixdp2x01.c.old +0 -3
@@ -23,9 +23,6 @@#include <linux/interrupt.h> #include <linux/bitops.h> #include <linux/pci.h> -#include <linux/interrupt.h> -#include <linux/mm.h> -#include <linux/init.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/delay.h>
arch/arm/mach-ixp4xx/common-pci.c renamed from arch/arm/mach-ixp4xx/common-pci.c.old +0 -1
@@ -33,7 +33,6 @@#include <asm/system.h> #include <asm/mach/pci.h> #include <asm/hardware.h> -#include <asm/sizes.h> /*
arch/arm/mach-lh7a40x/arch-kev7a400.c renamed from arch/arm/mach-lh7a40x/arch-kev7a400.c.old +0 -1
@@ -17,7 +17,6 @@#include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/hardware.h> /* io_p2v() */ #include <asm/irq.h> #include <asm/mach/irq.h> #include <asm/mach/map.h>
arch/arm/mach-lh7a40x/arch-lpd7a40x.c renamed from arch/arm/mach-lh7a40x/arch-lpd7a40x.c.old +0 -1
@@ -17,7 +17,6 @@#include <asm/setup.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> -#include <asm/hardware.h> /* io_p2v() */ #include <asm/irq.h> #include <asm/mach/irq.h> #include <asm/mach/map.h>
arch/i386/kernel/cpuid.c renamed from arch/i386/kernel/cpuid.c.old +0 -1
@@ -35,7 +35,6 @@#include <linux/major.h> #include <linux/fs.h> #include <linux/smp_lock.h> -#include <linux/fs.h> #include <linux/device.h> #include <linux/cpu.h> #include <linux/notifier.h>
arch/i386/mach-voyager/voyager_smp.c renamed from arch/i386/mach-voyager/voyager_smp.c.old +0 -1
@@ -27,7 +27,6 @@#include <asm/mtrr.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> -#include <asm/desc.h> #include <asm/arch_hooks.h> #include <linux/irq.h>
arch/ia64/kernel/time.c renamed from arch/ia64/kernel/time.c.old +0 -1
@@ -19,7 +19,6 @@#include <linux/time.h> #include <linux/interrupt.h> #include <linux/efi.h> -#include <linux/profile.h> #include <linux/timex.h> #include <asm/machvec.h>
arch/ia64/sn/kernel/setup.c renamed from arch/ia64/sn/kernel/setup.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/interrupt.h> #include <linux/acpi.h> #include <linux/compiler.h> -#include <linux/sched.h> #include <linux/root_dev.h> #include <asm/io.h>
arch/ia64/sn/pci/pcibr/pcibr_dma.c renamed from arch/ia64/sn/pci/pcibr/pcibr_dma.c.old +0 -1
@@ -17,7 +17,6 @@#include "pci/tiocp.h" #include "pci/pic.h" #include "pci/pcibr_provider.h" -#include "pci/tiocp.h" #include "tio.h" #include <asm/sn/addrs.h>
arch/m68k/q40/config.c renamed from arch/m68k/q40/config.c.old +0 -1
@@ -33,7 +33,6 @@#include <asm/setup.h> #include <asm/irq.h> #include <asm/traps.h> -#include <asm/rtc.h> #include <asm/machdep.h> #include <asm/q40_master.h>
arch/mips/au1000/csb250/init.c renamed from arch/mips/au1000/csb250/init.c.old +0 -1
@@ -35,7 +35,6 @@#include <asm/bootinfo.h> #include <linux/string.h> #include <linux/kernel.h> -#include <linux/sched.h> int prom_argc;char **prom_argv, **prom_envp;
arch/mips/au1000/hydrogen3/init.c renamed from arch/mips/au1000/hydrogen3/init.c.old +0 -1
@@ -37,7 +37,6 @@#include <linux/config.h> #include <linux/string.h> #include <linux/kernel.h> -#include <linux/sched.h> int prom_argc;char **prom_argv, **prom_envp;
arch/mips/au1000/mtx-1/init.c renamed from arch/mips/au1000/mtx-1/init.c.old +0 -1
@@ -38,7 +38,6 @@#include <linux/config.h> #include <linux/string.h> #include <linux/kernel.h> -#include <linux/sched.h> int prom_argc;char **prom_argv, **prom_envp;
arch/mips/mm/dma-coherent.c renamed from arch/mips/mm/dma-coherent.c.old +0 -2
@@ -210,8 +210,6 @@#ifdef CONFIG_PCI -#include <linux/pci.h> -dma64_addr_t pci_dac_page_to_dma (struct pci_dev *pdev,struct page *page,unsigned long offset,int direction) {
arch/mips/pci/pci-lasat.c renamed from arch/mips/pci/pci-lasat.c.old +0 -2
@@ -10,8 +10,6 @@#include <linux/interrupt.h> #include <linux/pci.h> #include <linux/types.h> -#include <linux/interrupt.h> -#include <linux/pci.h> #include <asm/pci_channel.h> #include <linux/delay.h> #include <asm/bootinfo.h>
arch/mips/pmc-sierra/yosemite/setup.c renamed from arch/mips/pmc-sierra/yosemite/setup.c.old +0 -1
@@ -37,7 +37,6 @@#include <asm/time.h> #include <asm/bootinfo.h> #include <asm/page.h> -#include <asm/bootinfo.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/processor.h>
arch/parisc/kernel/signal.c renamed from arch/parisc/kernel/signal.c.old +0 -1
@@ -34,7 +34,6 @@#include <asm/cacheflush.h> #ifdef CONFIG_COMPAT -#include <linux/compat.h> #include "signal32.h" #endif
arch/parisc/kernel/smp.c renamed from arch/parisc/kernel/smp.c.old +1 -2
@@ -39,14 +39,13 @@#include <asm/atomic.h> #include <asm/current.h> #include <asm/delay.h> -#include <asm/pgalloc.h> /* for flush_tlb_all() proto/macro */ +#include <asm/pgalloc.h> #include <asm/io.h> #include <asm/irq.h> /* for CPU_IRQ_REGION and friends */ #include <asm/mmu_context.h> #include <asm/page.h> #include <asm/pgtable.h> -#include <asm/pgalloc.h> #include <asm/processor.h> #include <asm/ptrace.h> #include <asm/unistd.h>
arch/ppc64/kernel/btext.c renamed from arch/ppc64/kernel/btext.c.old +0 -1
@@ -12,7 +12,6 @@#include <asm/sections.h> #include <asm/prom.h> #include <asm/btext.h> -#include <asm/prom.h> #include <asm/page.h> #include <asm/mmu.h> #include <asm/pgtable.h>
arch/ppc64/kernel/cpu_setup_power4.S renamed from arch/ppc64/kernel/cpu_setup_power4.S.old +0 -1
@@ -14,7 +14,6 @@ #include <asm/page.h> #include <asm/ppc_asm.h> #include <asm/cputable.h> -#include <asm/ppc_asm.h> #include <asm/offsets.h> #include <asm/cache.h>
arch/ppc64/kernel/iommu.c renamed from arch/ppc64/kernel/iommu.c.old +0 -1
@@ -32,7 +32,6 @@#include <linux/spinlock.h> #include <linux/string.h> #include <linux/dma-mapping.h> -#include <linux/init.h> #include <linux/bitops.h> #include <asm/io.h> #include <asm/prom.h>
arch/ppc64/kernel/iSeries_setup.c renamed from arch/ppc64/kernel/iSeries_setup.c.old +0 -1
@@ -44,7 +44,6 @@#include "iSeries_setup.h" #include <asm/naca.h> #include <asm/paca.h> -#include <asm/sections.h> #include <asm/iSeries/LparData.h> #include <asm/iSeries/HvCallHpt.h> #include <asm/iSeries/HvLpConfig.h>
arch/ppc64/kernel/pSeries_lpar.c renamed from arch/ppc64/kernel/pSeries_lpar.c.old +0 -1
@@ -37,7 +37,6 @@#include <asm/tlbflush.h> #include <asm/tlb.h> #include <asm/prom.h> -#include <asm/abs_addr.h> #include <asm/cputable.h> #include <asm/plpar_wrappers.h>
arch/ppc64/mm/hugetlbpage.c renamed from arch/ppc64/mm/hugetlbpage.c.old +0 -3
@@ -23,9 +23,6 @@#include <asm/mmu_context.h> #include <asm/machdep.h> #include <asm/cputable.h> -#include <asm/tlb.h> - -#include <linux/sysctl.h> /* HugePTE layout: *
arch/ppc64/mm/init.c renamed from arch/ppc64/mm/init.c.old +0 -1
@@ -61,7 +61,6 @@#include <asm/sections.h> #include <asm/system.h> #include <asm/iommu.h> -#include <asm/abs_addr.h> int mem_init_done;unsigned long ioremap_bot =IMALLOC_BASE ;
arch/ppc/kernel/cpu_setup_6xx.S renamed from arch/ppc/kernel/cpu_setup_6xx.S.old +0 -1
@@ -14,7 +14,6 @@ #include <asm/page.h> #include <asm/ppc_asm.h> #include <asm/cputable.h> -#include <asm/ppc_asm.h> #include <asm/offsets.h> #include <asm/cache.h>
arch/ppc/kernel/cpu_setup_power4.S renamed from arch/ppc/kernel/cpu_setup_power4.S.old +0 -1
@@ -14,7 +14,6 @@ #include <asm/page.h> #include <asm/ppc_asm.h> #include <asm/cputable.h> -#include <asm/ppc_asm.h> #include <asm/offsets.h> #include <asm/cache.h>
arch/ppc/syslib/gt64260_pic.c renamed from arch/ppc/syslib/gt64260_pic.c.old +0 -1
@@ -36,7 +36,6 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/signal.h> -#include <linux/stddef.h> #include <linux/delay.h> #include <linux/irq.h>
arch/ppc/syslib/mpc52xx_pic.c renamed from arch/ppc/syslib/mpc52xx_pic.c.old +0 -1
@@ -22,7 +22,6 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/signal.h> -#include <linux/stddef.h> #include <linux/delay.h> #include <linux/irq.h>
arch/ppc/xmon/start.c renamed from arch/ppc/xmon/start.c.old +0 -1
@@ -16,7 +16,6 @@#include <asm/xmon.h> #include <asm/prom.h> #include <asm/bootx.h> -#include <asm/machdep.h> #include <asm/errno.h> #include <asm/pmac_feature.h> #include <asm/processor.h>
arch/sh64/kernel/process.c renamed from arch/sh64/kernel/process.c.old +0 -1
@@ -924,7 +924,6 @@*/ #if defined(CONFIG_SH64_PROC_ASIDS ) -#include <linux/init.h> #include <linux/proc_fs.h> static int
arch/sh64/kernel/setup.c renamed from arch/sh64/kernel/setup.c.old +0 -4
@@ -59,10 +59,6 @@#include <asm/setup.h> #include <asm/smp.h> -#ifdef CONFIG_VT -#include <linux/console.h> -#endif -struct screen_info screen_info;/* On a PC this would be initialised as a result of the BIOS detecting the
arch/sh64/kernel/signal.c renamed from arch/sh64/kernel/signal.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/ptrace.h> #include <linux/unistd.h> #include <linux/stddef.h> -#include <linux/personality.h> #include <asm/ucontext.h> #include <asm/uaccess.h> #include <asm/pgtable.h>
arch/sh64/kernel/traps.c renamed from arch/sh64/kernel/traps.c.old +0 -2
@@ -243,8 +243,6 @@#endif /* CONFIG_SH64_ID2815_WORKAROUND */ -#include <asm/system.h> -/* Called with interrupts disabled */ asmlinkage void do_exception_error(unsigned long ex, struct pt_regs *regs) {
arch/sh/kernel/sh_ksyms.c renamed from arch/sh/kernel/sh_ksyms.c.old +0 -1
@@ -19,7 +19,6 @@#include <asm/delay.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> -#include <asm/checksum.h> extern void dump_thread (struct pt_regs *,struct user *);extern int dump_fpu (struct pt_regs *,elf_fpregset_t *);
arch/sparc64/kernel/module.c renamed from arch/sparc64/kernel/module.c.old +0 -1
@@ -11,7 +11,6 @@#include <linux/fs.h> #include <linux/string.h> #include <linux/slab.h> -#include <linux/vmalloc.h> #include <linux/mm.h> #include <asm/processor.h>
arch/sparc64/kernel/process.c renamed from arch/sparc64/kernel/process.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/slab.h> #include <linux/user.h> #include <linux/a.out.h> -#include <linux/config.h> #include <linux/reboot.h> #include <linux/delay.h> #include <linux/compat.h>
arch/sparc64/kernel/sys_sparc32.c renamed from arch/sparc64/kernel/sys_sparc32.c.old +0 -1
@@ -53,7 +53,6 @@#include <linux/vfs.h> #include <linux/netfilter_ipv4/ip_tables.h> #include <linux/ptrace.h> -#include <linux/highuid.h> #include <asm/types.h> #include <asm/ipc.h>
arch/sparc64/kernel/sys_sunos32.c renamed from arch/sparc64/kernel/sys_sunos32.c.old +0 -1
@@ -55,7 +55,6 @@#include <linux/personality.h> /* For SOCKET_I */ -#include <linux/socket.h> #include <net/sock.h> #include <net/compat.h>
arch/sparc64/kernel/time.c renamed from arch/sparc64/kernel/time.c.old +0 -1
@@ -29,7 +29,6 @@#include <linux/jiffies.h> #include <linux/cpufreq.h> #include <linux/percpu.h> -#include <linux/profile.h> #include <asm/oplib.h> #include <asm/mostek.h>
arch/sparc/kernel/irq.c renamed from arch/sparc/kernel/irq.c.old +0 -1
@@ -19,7 +19,6 @@#include <linux/linkage.h> #include <linux/kernel_stat.h> #include <linux/signal.h> -#include <linux/sched.h> #include <linux/interrupt.h> #include <linux/slab.h> #include <linux/random.h>
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;
drivers/block/viodasd.c renamed from drivers/block/viodasd.c.old +0 -1
@@ -41,7 +41,6 @@#include <linux/dma-mapping.h> #include <linux/completion.h> #include <linux/device.h> -#include <linux/kernel.h> #include <asm/uaccess.h> #include <asm/vio.h>
drivers/char/amiserial.c renamed from drivers/char/amiserial.c.old +0 -1
@@ -84,7 +84,6 @@#include <linux/mm.h> #include <linux/slab.h> #include <linux/init.h> -#include <linux/delay.h> #include <linux/bitops.h> #include <asm/setup.h>
drivers/char/lcd.c renamed from drivers/char/lcd.c.old +0 -1
@@ -29,7 +29,6 @@#include <asm/io.h> #include <asm/uaccess.h> #include <asm/system.h> -#include <linux/delay.h> #include "lcd.h"
drivers/char/ppdev.c renamed from drivers/char/ppdev.c.old +0 -1
@@ -68,7 +68,6 @@#include <asm/uaccess.h> #include <linux/ppdev.h> #include <linux/smp_lock.h> -#include <linux/device.h> #define PP_VERSION "ppdev: user-space parallel port driver"#define CHRDEV "ppdev"
drivers/char/synclink.c renamed from drivers/char/synclink.c.old +0 -1
@@ -90,7 +90,6 @@#include <linux/init.h> #include <asm/serial.h> -#include <linux/delay.h> #include <linux/ioctl.h> #include <asm/system.h>
drivers/cpufreq/cpufreq_ondemand.c renamed from drivers/cpufreq/cpufreq_ondemand.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/kmod.h> #include <linux/workqueue.h> #include <linux/jiffies.h> -#include <linux/config.h> #include <linux/kernel_stat.h> #include <linux/percpu.h>
drivers/i2c/chips/rtc8564.c renamed from drivers/i2c/chips/rtc8564.c.old +0 -1
@@ -19,7 +19,6 @@#include <linux/string.h> #include <linux/rtc.h> /* get the user-level API */ #include <linux/init.h> -#include <linux/init.h> #include "rtc8564.h"
drivers/input/gameport/vortex.c renamed from drivers/input/gameport/vortex.c.old +0 -1
@@ -40,7 +40,6 @@#include <linux/pci.h> #include <linux/init.h> #include <linux/slab.h> -#include <linux/delay.h> #include <linux/gameport.h> MODULE_AUTHOR ("Vojtech Pavlik <[email protected]>" );
drivers/macintosh/therm_pm72.c renamed from drivers/macintosh/therm_pm72.c.old +0 -1
@@ -102,7 +102,6 @@#include <linux/wait.h> #include <linux/reboot.h> #include <linux/kmod.h> -#include <linux/i2c.h> #include <linux/i2c-dev.h> #include <asm/prom.h> #include <asm/machdep.h>
drivers/media/video/arv.c renamed from drivers/media/video/arv.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/delay.h> #include <linux/errno.h> #include <linux/fs.h> -#include <linux/init.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/mm.h>
drivers/media/video/zr36016.c renamed from drivers/media/video/zr36016.c.old +0 -3
@@ -35,9 +35,6 @@#include <linux/types.h> #include <linux/wait.h> -/* includes for structures and defines regarding video -#include<linux/videodev.h> */ -/* I/O commands, error codes */ #include <asm/io.h> //#include<errno.h>
drivers/mtd/chips/jedec_probe.c renamed from drivers/mtd/chips/jedec_probe.c.old +0 -1
@@ -18,7 +18,6 @@#include <linux/errno.h> #include <linux/slab.h> #include <linux/interrupt.h> -#include <linux/init.h> #include <linux/mtd/mtd.h> #include <linux/mtd/map.h>
drivers/net/gianfar_ethtool.c renamed from drivers/net/gianfar_ethtool.c.old +0 -1
@@ -37,7 +37,6 @@#include <linux/version.h> #include <linux/crc32.h> #include <asm/types.h> -#include <asm/uaccess.h> #include <linux/ethtool.h> #include "gianfar.h"
drivers/net/gianfar.h renamed from drivers/net/gianfar.h.old +0 -1
@@ -46,7 +46,6 @@#include <linux/crc32.h> #include <linux/workqueue.h> #include <linux/ethtool.h> -#include <linux/netdevice.h> #include <asm/ocp.h> #include "gianfar_phy.h"
drivers/net/mv643xx_eth.c renamed from drivers/net/mv643xx_eth.c.old +0 -1
@@ -28,7 +28,6 @@#include <linux/version.h> #include <linux/module.h> #include <linux/kernel.h> -#include <linux/config.h> #include <linux/sched.h> #include <linux/ptrace.h> #include <linux/fcntl.h>
drivers/net/via-velocity.c renamed from drivers/net/via-velocity.c.old +0 -1
@@ -66,7 +66,6 @@#include <linux/wait.h> #include <asm/io.h> #include <linux/if.h> -#include <linux/config.h> #include <asm/uaccess.h> #include <linux/proc_fs.h> #include <linux/inetdevice.h>
drivers/parisc/lasi.c renamed from drivers/parisc/lasi.c.old +0 -1
@@ -20,7 +20,6 @@#include <linux/slab.h> #include <linux/module.h> #include <linux/pm.h> -#include <linux/slab.h> #include <linux/types.h> #include <asm/io.h>
drivers/scsi/ibmmca.c renamed from drivers/scsi/ibmmca.c.old +0 -1
@@ -36,7 +36,6 @@#include <linux/proc_fs.h> #include <linux/stat.h> #include <linux/mca.h> -#include <linux/string.h> #include <linux/spinlock.h> #include <linux/init.h> #include <linux/mca-legacy.h>
drivers/usb/serial/ipw.c renamed from drivers/usb/serial/ipw.c.old +0 -1
@@ -46,7 +46,6 @@#include <linux/module.h> #include <linux/spinlock.h> #include <linux/usb.h> -#include <linux/usb.h> #include <asm/uaccess.h> #include "usb-serial.h"
drivers/video/fbmem.c renamed from drivers/video/fbmem.c.old +0 -2
@@ -33,7 +33,6 @@#endif #include <linux/devfs_fs_kernel.h> #include <linux/err.h> -#include <linux/kernel.h> #include <linux/device.h> #if defined(__mc68000__) || defined(CONFIG_APUS )
@@ -205,7 +204,6 @@ }#ifdef CONFIG_LOGO -#include <linux/linux_logo.h> static inline unsigned safe_shift (unsigned d,int n) {
drivers/video/tgafb.c renamed from drivers/video/tgafb.c.old +0 -1
@@ -26,7 +26,6 @@#include <linux/selection.h> #include <asm/io.h> #include <video/tgafb.h> -#include <linux/selection.h> /* * Local functions.
drivers/w1/matrox_w1.c renamed from drivers/w1/matrox_w1.c.old +0 -1
@@ -33,7 +33,6 @@#include <linux/slab.h> #include <linux/pci_ids.h> #include <linux/pci.h> -#include <linux/timer.h> #include "w1.h" #include "w1_int.h"
include/asm-ia64/pgtable.h renamed from include/asm-ia64/pgtable.h.old +0 -1
@@ -130,7 +130,6 @@#include <asm/bitops.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h> -#include <asm/processor.h> /* * Next come the mappings that determine how mmap() protection bits
include/asm-ia64/unistd.h renamed from include/asm-ia64/unistd.h.old +0 -1
@@ -289,7 +289,6 @@#ifdef __KERNEL_SYSCALLS__ -#include <linux/compiler.h> #include <linux/string.h> #include <linux/signal.h> #include <asm/ptrace.h>
include/asm-m32r/mmu_context.h renamed from include/asm-m32r/mmu_context.h.old +0 -1
@@ -15,7 +15,6 @@#ifndef __ASSEMBLY__ -#include <linux/config.h> #include <asm/atomic.h> #include <asm/pgalloc.h> #include <asm/mmu.h>
include/asm-mips/mach-dec/mc146818rtc.h renamed from include/asm-mips/mach-dec/mc146818rtc.h.old +0 -1
@@ -29,7 +29,6 @@#include <linux/mc146818rtc.h> #include <linux/module.h> -#include <linux/types.h> static inline unsigned char CMOS_READ (unsigned long addr) {
include/asm-ppc64/elf.h renamed from include/asm-ppc64/elf.h.old +0 -1
@@ -85,7 +85,6 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include <asm/ptrace.h> #define ELF_NGREG 48/* includes nip, msr, lr, etc. */ #define ELF_NFPREG 33/* includes fpscr */
include/asm-sparc/system.h renamed from include/asm-sparc/system.h.old +0 -2
@@ -1,6 +1,4 @@/* $Id: system.h,v 1.86 2001/10/30 04:57:10 davem Exp $ */ -#include <linux/config.h> -#ifndef __SPARC_SYSTEM_H#define __SPARC_SYSTEM_H
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);
include/linux/ipv6.h renamed from include/linux/ipv6.h.old +0 -1
@@ -171,7 +171,6 @@ };#ifdef __KERNEL__ -#include <linux/in6.h> /* struct sockaddr_in6 */ #include <linux/icmpv6.h> #include <net/if_inet6.h> /* struct ipv6_mc_socklist */ #include <linux/tcp.h>
include/linux/nfs_fs.h renamed from include/linux/nfs_fs.h.old +0 -1
@@ -28,7 +28,6 @@#include <linux/nfs3.h> #include <linux/nfs4.h> #include <linux/nfs_xdr.h> -#include <linux/rwsem.h> #include <linux/workqueue.h> /*
kernel/profile.c renamed from kernel/profile.c.old +0 -1
@@ -21,7 +21,6 @@#include <linux/mm.h> #include <linux/cpumask.h> #include <linux/cpu.h> -#include <linux/profile.h> #include <linux/highmem.h> #include <asm/sections.h> #include <asm/semaphore.h>
mm/mempolicy.c renamed from mm/mempolicy.c.old +0 -2
@@ -65,7 +65,6 @@#include <linux/hugetlb.h> #include <linux/kernel.h> #include <linux/sched.h> -#include <linux/mm.h> #include <linux/nodemask.h> #include <linux/cpuset.h> #include <linux/gfp.h>
@@ -75,7 +74,6 @@#include <linux/interrupt.h> #include <linux/init.h> #include <linux/compat.h> -#include <linux/mempolicy.h> #include <asm/uaccess.h> static kmem_cache_t *policy_cache;
mm/swap.c renamed from mm/swap.c.old +0 -2
@@ -24,12 +24,10 @@#include <linux/module.h> #include <linux/mm_inline.h> #include <linux/buffer_head.h> /* for try_to_release_page() */ -#include <linux/module.h> #include <linux/percpu_counter.h> #include <linux/percpu.h> #include <linux/cpu.h> #include <linux/notifier.h> -#include <linux/init.h> /* How many pages do we try to swap or page in/out together? */ int page_cluster;
mm/swapfile.c renamed from mm/swapfile.c.old +0 -1
@@ -1075,7 +1075,6 @@ }#if 0 /* We don't need this yet */ -#include <linux/backing-dev.h> int page_queue_congested (struct page *page) {struct backing_dev_info *bdi;
net/atm/lec.c renamed from net/atm/lec.c.old +0 -1
@@ -21,7 +21,6 @@#include <net/dst.h> #include <linux/proc_fs.h> #include <linux/spinlock.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> /* TokenRing if needed */
net/ipv4/ip_output.c renamed from net/ipv4/ip_output.c.old +0 -1
@@ -78,7 +78,6 @@#include <net/raw.h> #include <net/checksum.h> #include <net/inetpeer.h> -#include <net/checksum.h> #include <linux/igmp.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_bridge.h>
net/ipv4/ipvs/ip_vs_ctl.c renamed from net/ipv4/ipvs/ip_vs_ctl.c.old +0 -1
@@ -28,7 +28,6 @@#include <linux/proc_fs.h> #include <linux/workqueue.h> #include <linux/swap.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/netfilter.h>
net/ipv4/netfilter/ip_conntrack_proto_icmp.c renamed from net/ipv4/netfilter/ip_conntrack_proto_icmp.c.old +0 -1
@@ -15,7 +15,6 @@#include <linux/seq_file.h> #include <net/ip.h> #include <net/checksum.h> -#include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4/ip_conntrack.h> #include <linux/netfilter_ipv4/ip_conntrack_core.h>
net/ipv4/netfilter/ip_conntrack_proto_tcp.c renamed from net/ipv4/netfilter/ip_conntrack_proto_tcp.c.old +0 -1
@@ -32,7 +32,6 @@#include <net/tcp.h> -#include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4/ip_conntrack.h> #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
net/ipv4/netfilter/ip_conntrack_proto_udp.c renamed from net/ipv4/netfilter/ip_conntrack_proto_udp.c.old +0 -1
@@ -14,7 +14,6 @@#include <linux/udp.h> #include <linux/seq_file.h> #include <net/checksum.h> -#include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
net/ipv6/tcp_ipv6.c renamed from net/ipv6/tcp_ipv6.c.old +0 -1
@@ -55,7 +55,6 @@#include <net/inet_ecn.h> #include <net/protocol.h> #include <net/xfrm.h> -#include <net/addrconf.h> #include <net/snmp.h> #include <net/dsfield.h>
net/sched/police.c renamed from net/sched/police.c.old +0 -1
@@ -27,7 +27,6 @@#include <linux/interrupt.h> #include <linux/netdevice.h> #include <linux/skbuff.h> -#include <linux/module.h> #include <linux/rtnetlink.h> #include <linux/init.h> #include <net/sock.h>
net/sunrpc/auth_gss/svcauth_gss.c renamed from net/sunrpc/auth_gss/svcauth_gss.c.old +0 -1
@@ -44,7 +44,6 @@#include <linux/sunrpc/auth_gss.h> #include <linux/sunrpc/svcauth.h> #include <linux/sunrpc/gss_err.h> -#include <linux/sunrpc/svcauth.h> #include <linux/sunrpc/svcauth_gss.h> #include <linux/sunrpc/cache.h>
net/wanrouter/wanmain.c renamed from net/wanrouter/wanmain.c.old +0 -1
@@ -57,7 +57,6 @@#include <linux/vmalloc.h> /* vmalloc, vfree */ #include <asm/uaccess.h> /* copy_to/from_user */ -#include <linux/init.h> /* __initfunc et al. */ #include <net/syncppp.h> #define KMEM_SAFETYZONE 8
sound/oss/rme96xx.c renamed from sound/oss/rme96xx.c.old +0 -1
@@ -56,7 +56,6 @@#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/init.h> -#include <linux/interrupt.h> #include <linux/poll.h> #include <linux/wait.h>
drivers/cpufreq/cpufreq_ondemand.c line 30
Quoted 9 lines · Adrian Bunk
drivers/cpufreq/cpufreq_ondemand.c renamed from drivers/cpufreq/cpufreq_ondemand.c.old +0
-1@@ -26,7 +26,6 @@#include <linux/kmod.h> #include <linux/workqueue.h> #include <linux/jiffies.h> -#include <linux/config.h> #include <linux/kernel_stat.h> #include <linux/percpu.h>
Not only was this duplicated, but its also unnecessary as there are no CONFIG_ options in that file.
You may want to add that checking to your script too.
I've killed them both in cpufreq-bk
thanks,
Dave
Quoted 15 lines · Dave Jones
drivers/cpufreq/cpufreq_ondemand.c line 30
Quoted 9 lines · Adrian Bunk
drivers/cpufreq/cpufreq_ondemand.c renamed from drivers/cpufreq/cpufreq_ondemand.c.old +0
-1@@ -26,7 +26,6 @@#include <linux/kmod.h> #include <linux/workqueue.h> #include <linux/jiffies.h> -#include <linux/config.h> #include <linux/kernel_stat.h> #include <linux/percpu.h> Not only was this duplicated, but its also unnecessary as there are no
CONFIG_options in that file.
You may want to add that checking to your script too.
That's 'make configcheck'...
Signature · 1 line
~Randy
Quoted 5 lines · Adrian Bunk
Below is a patch that removes in cases where a file is included directly twice in a file the second inclusion.
arch/m68k/q40/config.c | 1 - drivers/char/amiserial.c | 1 -
Thanks! Applied.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds