remove duplicate #includes, take II
Subsystems (42)
Andrew! Folks!
after the response to the first (cruel?) approach here is a different one (probably as incomplete and imperfect as the previous, but it seems that there is a solution in reach)
this time I utilized the checkincludes.pl script to identify and automatically remove duplicates. this was done with the following command sequence:
find . -type f -name '*.[hcS]' \
-exec scripts/checkincludes.pl {} \; \
| gawk -F"[: ]" '
{ printf "egrep -nH \"#\\W*include\\W*<%s>\" %s\n",$3,$1 }' \
| sh \
| gawk -F: '{ X[$1]=$2; }
END { for (i in X) printf "%s %d\n",i, X[i] }' \
| gawk '{ printf "mv %s %s.orig && sed -ne \"%dd;p\" %s.orig >%s && echo %s\n",$1,$1,$2,$1,$1,$1; }' \
| shwhich basically executes checkincludes.pl on all .c, .h and .S files, then greps for '<'*'>' type includes (to avoid the "*" type ones, which are usually local includes) and then removes the last occurence of the identified include from the file
I then splitted it into three categories:
A) probably correct
B) probably wrong
C) definitely wrong
so if folks want to cherry pick and/or comment on the first two categories, please do so, I will collect all the feedback and produce a patch to get rid of the duplicates later ...
best,
Herbert
[PATCH/RFC] remove duplicate #includes, take II, A
probably correct hunks
---
arch/alpha/kernel/setup.c +0 -1
@@ -55,7 +55,6 @@ static struct notifier_block alpha_panic#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/armksyms.c +0 -1
@@ -9,7 +9,6 @@*/ #include <linux/module.h> #include <linux/config.h> -#include <linux/module.h> #include <linux/user.h> #include <linux/string.h> #include <linux/fs.h>
arch/cris/arch-v32/mm/init.c +0 -1
@@ -11,7 +11,6 @@#include <linux/init.h> #include <linux/bootmem.h> #include <linux/mm.h> -#include <linux/config.h> #include <asm/pgtable.h> #include <asm/page.h> #include <asm/types.h>
arch/i386/kernel/cpuid.c +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/ia64/ia32/ia32priv.h +0 -1
@@ -291,7 +291,6 @@ struct old_linux32_dirent {#define _ASM_IA64_ELF_H/* Don't include elf.h */ #include <linux/sched.h> -#include <asm/processor.h> /* * This is used to ensure we don't load something for the wrong architecture.
arch/ia64/ia32/sys_ia32.c +0 -1
@@ -36,7 +36,6 @@#include <linux/uio.h> #include <linux/nfs_fs.h> #include <linux/quota.h> -#include <linux/syscalls.h> #include <linux/sunrpc/svc.h> #include <linux/nfsd/nfsd.h> #include <linux/nfsd/cache.h>
arch/ia64/kernel/setup.c +0 -1
@@ -60,7 +60,6 @@#include <asm/smp.h> #include <asm/system.h> #include <asm/unistd.h> -#include <asm/system.h> #if defined(CONFIG_SMP ) && (IA64_CPU_SIZE >PAGE_SIZE )# error "struct cpuinfo_ia64 too big!"
arch/ia64/kernel/time.c +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 +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 <linux/nodemask.h> #include <linux/pm.h>
arch/m68knommu/platform/5206e/config.c +0 -1
@@ -21,7 +21,6 @@#include <asm/mcftimer.h> #include <asm/mcfsim.h> #include <asm/mcfdma.h> -#include <asm/irq.h> /***************************************************************************/
arch/mips/kernel/signal_n32.c +0 -1
@@ -17,7 +17,6 @@*/ #include <linux/cache.h> #include <linux/sched.h> -#include <linux/sched.h> #include <linux/mm.h> #include <linux/smp.h> #include <linux/smp_lock.h>
arch/mips/mips-boards/sim/sim_time.c +0 -1
@@ -17,7 +17,6 @@#include <linux/timex.h> #include <asm/mipsregs.h> #include <asm/ptrace.h> -#include <asm/hardirq.h> #include <asm/irq.h> #include <asm/div64.h> #include <asm/cpu.h>
arch/mips/tx4938/common/setup.c +0 -1
@@ -31,7 +31,6 @@#include <asm/mipsregs.h> #include <asm/system.h> #include <asm/time.h> -#include <asm/time.h> #include <asm/tx4938/rbtx4938.h> extern void toshiba_rbtx4938_setup (void );
arch/parisc/kernel/signal.c +0 -1
@@ -35,7 +35,6 @@#include <asm/asm-offsets.h> #ifdef CONFIG_COMPAT -#include <linux/compat.h> #include "signal32.h" #endif
arch/powerpc/kernel/btext.c +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/powerpc/kernel/iommu.c +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/powerpc/kernel/time.c +0 -1
@@ -70,7 +70,6 @@#include <asm/iseries/it_lp_queue.h> #include <asm/iseries/hv_call_xm.h> #endif -#include <asm/smp.h> /* keep track of when we need to update the rtc */ time_t last_rtc_update;
arch/powerpc/mm/hash_utils_64.c +0 -1
@@ -50,7 +50,6 @@#include <asm/tlb.h> #include <asm/cacheflush.h> #include <asm/cputable.h> -#include <asm/abs_addr.h> #include <asm/sections.h> #ifdef DEBUG
arch/powerpc/mm/hugetlbpage.c +0 -1
@@ -25,7 +25,6 @@#include <asm/cputable.h> #include <asm/tlb.h> -#include <linux/sysctl.h> #define NUM_LOW_AREAS (0x100000000UL >> SID_SHIFT)#define NUM_HIGH_AREAS (PGTABLE_RANGE >> HTLB_AREA_SHIFT)
arch/powerpc/mm/init_32.c +0 -1
@@ -43,7 +43,6 @@#include <asm/machdep.h> #include <asm/btext.h> #include <asm/tlb.h> -#include <asm/prom.h> #include <asm/lmb.h> #include <asm/sections.h>
arch/powerpc/mm/mem.c +0 -1
@@ -43,7 +43,6 @@#include <asm/machdep.h> #include <asm/btext.h> #include <asm/tlb.h> -#include <asm/prom.h> #include <asm/lmb.h> #include <asm/sections.h> #include <asm/vdso.h>
arch/powerpc/platforms/cell/iommu.c +0 -1
@@ -29,7 +29,6 @@#include <linux/bootmem.h> #include <linux/mm.h> #include <linux/dma-mapping.h> -#include <linux/kernel.h> #include <linux/compiler.h> #include <asm/sections.h>
arch/powerpc/platforms/chrp/setup.c +0 -1
@@ -36,7 +36,6 @@#include <linux/seq_file.h> #include <linux/root_dev.h> #include <linux/initrd.h> -#include <linux/module.h> #include <asm/io.h> #include <asm/pgtable.h>
arch/powerpc/platforms/chrp/smp.c +0 -1
@@ -32,7 +32,6 @@#include <asm/time.h> #include <asm/open_pic.h> #include <asm/machdep.h> -#include <asm/smp.h> #include <asm/mpic.h> #include <asm/rtas.h>
arch/powerpc/platforms/iseries/setup.c +0 -1
@@ -43,7 +43,6 @@#include <asm/time.h> #include <asm/paca.h> #include <asm/cache.h> -#include <asm/sections.h> #include <asm/abs_addr.h> #include <asm/iseries/hv_lp_config.h> #include <asm/iseries/hv_call_event.h>
arch/powerpc/platforms/powermac/low_i2c.c +0 -1
@@ -41,7 +41,6 @@#include <linux/completion.h> #include <linux/platform_device.h> #include <linux/interrupt.h> -#include <linux/completion.h> #include <linux/timer.h> #include <asm/keylargo.h> #include <asm/uninorth.h>
arch/powerpc/platforms/powermac/udbg_adb.c +0 -1
@@ -13,7 +13,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/powerpc/platforms/pseries/lpar.c +0 -1
@@ -36,7 +36,6 @@#include <asm/tlbflush.h> #include <asm/tlb.h> #include <asm/prom.h> -#include <asm/abs_addr.h> #include <asm/cputable.h> #include <asm/udbg.h> #include <asm/smp.h>
arch/ppc/platforms/85xx/stx_gp3.c +0 -1
@@ -53,7 +53,6 @@#include <asm/irq.h> #include <asm/immap_85xx.h> #include <asm/cpm2.h> -#include <asm/mpc85xx.h> #include <asm/ppc_sys.h> #include <syslib/cpm2_pic.h>
arch/ppc/platforms/chrp_setup.c +0 -1
@@ -36,7 +36,6 @@#include <linux/seq_file.h> #include <linux/root_dev.h> #include <linux/initrd.h> -#include <linux/module.h> #include <asm/io.h> #include <asm/pgtable.h>
arch/ppc/syslib/gt64260_pic.c +0 -1
@@ -37,7 +37,6 @@#include <linux/interrupt.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 +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/syslib/mv64360_pic.c +0 -1
@@ -38,7 +38,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> #include <linux/interrupt.h>
arch/ppc/xmon/start.c +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/processor.h> #include <asm/delay.h>
arch/sh/kernel/sh_ksyms.c +0 -1
@@ -19,7 +19,6 @@#include <asm/delay.h> #include <asm/tlbflush.h> #include <asm/cacheflush.h> -#include <asm/checksum.h> extern int dump_fpu (struct pt_regs *,elf_fpregset_t *);extern struct hw_interrupt_type no_irq_type;
arch/sh/kernel/smp.c +0 -1
@@ -22,7 +22,6 @@#include <linux/time.h> #include <linux/timex.h> #include <linux/sched.h> -#include <linux/module.h> #include <asm/atomic.h> #include <asm/processor.h>
arch/sh64/kernel/signal.c +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 +0 -1
@@ -244,7 +244,6 @@ DO_ERROR(12, SIGILL, "reserved instruct#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/sparc/kernel/irq.c +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/sparc64/kernel/module.c +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 +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 +0 -1
@@ -54,7 +54,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 +0 -1
@@ -56,7 +56,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 +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/x86_64/kernel/x8664_ksyms.c +0 -1
@@ -30,7 +30,6 @@#include <asm/kdebug.h> #include <asm/unistd.h> #include <asm/tlbflush.h> -#include <asm/kdebug.h> extern spinlock_t rtc_lock;
arch/xtensa/kernel/align.S +0 -1
@@ -17,7 +17,6 @@ #include <linux/linkage.h> #include <asm/ptrace.h> -#include <asm/ptrace.h> #include <asm/current.h> #include <asm/asm-offsets.h> #include <asm/pgtable.h>
arch/xtensa/kernel/asm-offsets.c +0 -1
@@ -19,7 +19,6 @@#include <linux/thread_info.h> #include <linux/ptrace.h> #include <asm/ptrace.h> -#include <asm/processor.h> #include <asm/uaccess.h> #define DEFINE (sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
arch/xtensa/kernel/vectors.S +0 -1
@@ -44,7 +44,6 @@ #include <linux/linkage.h> #include <asm/ptrace.h> -#include <asm/ptrace.h> #include <asm/current.h> #include <asm/asm-offsets.h> #include <asm/pgtable.h>
arch/xtensa/mm/init.c +0 -1
@@ -34,7 +34,6 @@#include <asm/tlbflush.h> #include <asm/page.h> #include <asm/pgalloc.h> -#include <asm/pgtable.h> #define DEBUG 0
arch/xtensa/platform-iss/console.c +0 -1
@@ -21,7 +21,6 @@#include <linux/param.h> #include <linux/serial.h> #include <linux/serialP.h> -#include <linux/console.h> #include <asm/uaccess.h> #include <asm/irq.h>
arch/xtensa/platform-iss/network.c +0 -1
@@ -32,7 +32,6 @@#include <linux/bootmem.h> #include <linux/ethtool.h> #include <linux/rtnetlink.h> -#include <linux/timer.h> #include <linux/platform_device.h> #include <xtensa/simcall.h>
drivers/atm/lanai.c +0 -1
@@ -65,7 +65,6 @@#include <linux/init.h> #include <linux/delay.h> #include <linux/interrupt.h> -#include <linux/dma-mapping.h> /* -------------------- TUNABLE PARAMATERS: */
drivers/block/viodasd.c +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/drm/drm_memory.h +0 -1
@@ -45,7 +45,6 @@#if __OS_HAS_AGP -#include <linux/vmalloc.h> #ifdef HAVE_PAGE_AGP #include <asm/agp.h>
drivers/char/lcd.c +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 +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 +0 -1
@@ -89,7 +89,6 @@#include <linux/init.h> #include <asm/serial.h> -#include <linux/delay.h> #include <linux/ioctl.h> #include <asm/system.h>
drivers/input/gameport/gameport.c +0 -1
@@ -21,7 +21,6 @@#include <linux/slab.h> #include <linux/delay.h> #include <linux/kthread.h> -#include <linux/sched.h> /* HZ */ /*#include <asm/io.h>*/
drivers/macintosh/therm_pm72.c +0 -1
@@ -112,7 +112,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 +0 -1
@@ -25,7 +25,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/mtd/chips/jedec_probe.c +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/mtd/devices/m25p80.c +0 -1
@@ -19,7 +19,6 @@#include <linux/module.h> #include <linux/device.h> #include <linux/interrupt.h> -#include <linux/interrupt.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/spi/spi.h>
drivers/net/bonding/bond_sysfs.c +0 -1
@@ -33,7 +33,6 @@#include <linux/inetdevice.h> #include <linux/in.h> #include <linux/sysfs.h> -#include <linux/string.h> #include <linux/ctype.h> #include <linux/inet.h> #include <linux/rtnetlink.h>
drivers/net/fs_enet/fs_enet-main.c +0 -1
@@ -42,7 +42,6 @@#include <linux/vmalloc.h> #include <asm/pgtable.h> -#include <asm/pgtable.h> #include <asm/irq.h> #include <asm/uaccess.h>
drivers/net/gianfar.h +0 -1
@@ -46,7 +46,6 @@#include <linux/crc32.h> #include <linux/workqueue.h> #include <linux/ethtool.h> -#include <linux/netdevice.h> #include <linux/fsl_devices.h> #include "gianfar_mii.h"
drivers/net/gianfar_ethtool.c +0 -1
@@ -36,7 +36,6 @@#include <linux/module.h> #include <linux/crc32.h> #include <asm/types.h> -#include <asm/uaccess.h> #include <linux/ethtool.h> #include <linux/mii.h> #include <linux/phy.h>
drivers/net/mipsnet.c +0 -1
@@ -12,7 +12,6 @@#include <linux/netdevice.h> #include <linux/sched.h> #include <linux/etherdevice.h> -#include <linux/netdevice.h> #include <linux/platform_device.h> #include <asm/io.h> #include <asm/mips-boards/simint.h>
drivers/net/mv643xx_eth.c +0 -1
@@ -38,7 +38,6 @@#include <linux/udp.h> #include <linux/etherdevice.h> #include <linux/in.h> -#include <linux/ip.h> #include <linux/bitops.h> #include <linux/delay.h>
drivers/net/via-velocity.c +0 -1
@@ -65,7 +65,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/net/wireless/ipw2200.h +0 -1
@@ -45,7 +45,6 @@#include <linux/firmware.h> #include <linux/wireless.h> -#include <linux/dma-mapping.h> #include <asm/io.h> #include <net/ieee80211.h>
drivers/parisc/ccio-dma.c +0 -1
@@ -75,7 +75,6 @@#undef CCIO_MAP_STATS#endif -#include <linux/proc_fs.h> #include <asm/runway.h> /* for proc_runway_root */ #ifdef DEBUG_CCIO_INIT
drivers/scsi/NCR_D700.c +0 -1
@@ -97,7 +97,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/mca.h> -#include <linux/interrupt.h> #include <asm/io.h> #include <scsi/scsi_host.h> #include <scsi/scsi_device.h>
drivers/scsi/seagate.c +0 -1
@@ -97,7 +97,6 @@#include <linux/delay.h> #include <linux/blkdev.h> #include <linux/stat.h> -#include <linux/delay.h> #include <asm/io.h> #include <asm/system.h>
drivers/spi/spi_butterfly.c +0 -1
@@ -187,7 +187,6 @@ static void butterfly_chipselect(struct//#define spidelay ndelay #define EXPAND_BITBANG_TXRX -#include <linux/spi/spi_bitbang.h> static u32 butterfly_txrx_word_mode0(struct spi_device *spi,
drivers/video/fbmem.c +0 -1
@@ -34,7 +34,6 @@#endif #include <linux/devfs_fs_kernel.h> #include <linux/err.h> -#include <linux/kernel.h> #include <linux/device.h> #include <linux/efi.h>
drivers/video/tgafb.c +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 +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"
fs/compat_ioctl.c +0 -1
@@ -122,7 +122,6 @@#include <linux/dvb/dmx.h> #include <linux/dvb/frontend.h> #include <linux/dvb/video.h> -#include <linux/lp.h> /* Aiee. Someone does not find a difference between int and long */ #define EXT2_IOC32_GETFLAGS _IOR('f', 1, int)
fs/namei.c +0 -1
@@ -31,7 +31,6 @@#include <linux/capability.h> #include <linux/file.h> #include <linux/fcntl.h> -#include <linux/namei.h> #include <asm/namei.h> #include <asm/uaccess.h>
include/asm-alpha/core_cia.h +0 -1
@@ -482,7 +482,6 @@ __EXTERN_INLINE int cia_bwx_is_mmio(cons#define cia_bwx_trivial_io_bw 1#define cia_bwx_trivial_io_lq 1#define cia_bwx_trivial_iounmap 1 -#include <asm/io_trivial.h> #undef __IO_PREFIX#ifdef CONFIG_ALPHA_PYXIS
include/asm-ia64/pgtable.h +0 -1
@@ -154,7 +154,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-mips/tx4938/tx4938.h +0 -1
@@ -81,7 +81,6 @@#else #define _CONST64 (c) c##ull -#include <asm/byteorder.h> #ifdef __BIG_ENDIAN#define endian_def_l2 (e1,e2) \
include/asm-ppc/page.h +0 -1
@@ -15,7 +15,6 @@#define PAGE_MASK (~((1 << PAGE_SHIFT) - 1))#ifdef __KERNEL__ -#include <linux/config.h> /* This must match what is in arch/ppc/Makefile */ #define PAGE_OFFSET CONFIG_KERNEL_START
include/asm-sparc/system.h +0 -1
@@ -4,7 +4,6 @@#ifndef __SPARC_SYSTEM_H#define __SPARC_SYSTEM_H -#include <linux/config.h> #include <linux/kernel.h> #include <linux/threads.h> /* NR_CPUS */ #include <linux/thread_info.h>
include/asm-x86_64/unistd.h +0 -1
@@ -814,7 +814,6 @@ asmlinkage long sys_pipe(int *fildes);#include <linux/linkage.h> #include <linux/compiler.h> #include <linux/types.h> -#include <asm/ptrace.h> asmlinkage long sys_iopl (unsigned int level,struct pt_regs *regs);asmlinkage long sys_ioperm (unsigned long from,unsigned long num,int turn_on);
include/linux/atalk.h +0 -1
@@ -85,7 +85,6 @@ static inline struct atalk_sock *at_sk(sreturn (struct atalk_sock *)sk; } -#include <asm/byteorder.h> struct ddpehdr {#ifdef __LITTLE_ENDIAN_BITFIELD
include/linux/memory_hotplug.h +0 -1
@@ -3,7 +3,6 @@#include <linux/mmzone.h> #include <linux/spinlock.h> -#include <linux/mmzone.h> #include <linux/notifier.h> #ifdef CONFIG_MEMORY_HOTPLUG
include/linux/nfs_fs.h +0 -1
@@ -27,7 +27,6 @@#include <linux/nfs3.h> #include <linux/nfs4.h> #include <linux/nfs_xdr.h> -#include <linux/rwsem.h> #include <linux/mempool.h> /*
include/net/ieee80211.h +0 -1
@@ -177,7 +177,6 @@ const char *escape_essid(const char *ess #define IEEE80211_DEBUG_RX(f, a...) IEEE80211_DEBUG(IEEE80211_DL_RX, f, ## a) #define IEEE80211_DEBUG_QOS(f, a...) IEEE80211_DEBUG(IEEE80211_DL_QOS, f, ## a)#include <linux/netdevice.h> -#include <linux/wireless.h> #include <linux/if_arp.h> /* ARPHRD_ETHER */ #ifndef WIRELESS_SPY
kernel/kexec.c +0 -1
@@ -17,7 +17,6 @@#include <linux/highmem.h> #include <linux/syscalls.h> #include <linux/reboot.h> -#include <linux/syscalls.h> #include <linux/ioport.h> #include <linux/hardirq.h>
kernel/profile.c +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>
kernel/rcupdate.c +0 -1
@@ -45,7 +45,6 @@#include <linux/moduleparam.h> #include <linux/percpu.h> #include <linux/notifier.h> -#include <linux/rcupdate.h> #include <linux/cpu.h> /* Definition for rcupdate control block. */
kernel/rcutorture.c +0 -1
@@ -34,7 +34,6 @@#include <linux/sched.h> #include <asm/atomic.h> #include <linux/bitops.h> -#include <linux/module.h> #include <linux/completion.h> #include <linux/moduleparam.h> #include <linux/percpu.h>
kernel/sysctl.c +0 -1
@@ -28,7 +28,6 @@#include <linux/capability.h> #include <linux/ctype.h> #include <linux/utsname.h> -#include <linux/capability.h> #include <linux/smp_lock.h> #include <linux/init.h> #include <linux/kernel.h>
kernel/time.c +0 -1
@@ -35,7 +35,6 @@#include <linux/syscalls.h> #include <linux/security.h> #include <linux/fs.h> -#include <linux/module.h> #include <asm/uaccess.h> #include <asm/unistd.h>
mm/mempolicy.c +0 -1
@@ -82,7 +82,6 @@#include <linux/interrupt.h> #include <linux/init.h> #include <linux/compat.h> -#include <linux/mempolicy.h> #include <linux/swap.h> #include <linux/seq_file.h> #include <linux/proc_fs.h>
mm/swap.c +0 -1
@@ -29,7 +29,6 @@#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 +0 -1
@@ -1070,7 +1070,6 @@ out: }#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 +0 -1
@@ -22,7 +22,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/bridge/netfilter/ebt_log.c +0 -1
@@ -15,7 +15,6 @@#include <linux/netfilter.h> #include <linux/module.h> #include <linux/ip.h> -#include <linux/in.h> #include <linux/if_arp.h> #include <linux/spinlock.h>
net/bridge/netfilter/ebt_ulog.c +0 -1
@@ -37,7 +37,6 @@#include <linux/timer.h> #include <linux/netlink.h> #include <linux/netdevice.h> -#include <linux/module.h> #include <linux/netfilter_bridge/ebtables.h> #include <linux/netfilter_bridge/ebt_ulog.h> #include <net/sock.h>
net/ipv4/ip_output.c +0 -1
@@ -76,7 +76,6 @@#include <net/icmp.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 +0 -1
@@ -29,7 +29,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/ipt_CLUSTERIP.c +0 -1
@@ -20,7 +20,6 @@#include <linux/udp.h> #include <linux/icmp.h> #include <linux/if_arp.h> -#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <net/checksum.h>
net/ipv4/tcp_cubic.c +0 -1
@@ -52,7 +52,6 @@ MODULE_PARM_DESC(bic_scale, "scale (scalmodule_param (tcp_friendliness, int,0644 );MODULE_PARM_DESC (tcp_friendliness,"turn on/off tcp friendliness" ); -#include <asm/div64.h> /* BIC TCP Parameters */ struct bictcp {
net/ipv6/tcp_ipv6.c +0 -1
@@ -57,7 +57,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> #include <net/timewait_sock.h>
net/netfilter/nf_conntrack_proto_tcp.c +0 -1
@@ -39,7 +39,6 @@#include <net/tcp.h> -#include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h> #include <net/netfilter/nf_conntrack.h>
net/netfilter/nf_conntrack_proto_udp.c +0 -1
@@ -22,7 +22,6 @@#include <linux/ipv6.h> #include <net/ip6_checksum.h> #include <net/checksum.h> -#include <linux/netfilter.h> #include <linux/netfilter_ipv4.h> #include <linux/netfilter_ipv6.h> #include <net/netfilter/nf_conntrack_protocol.h>
net/sched/act_police.c +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 +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 +0 -1
@@ -58,7 +58,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/core/rawmidi.c +0 -1
@@ -30,7 +30,6 @@#include <linux/wait.h> #include <linux/moduleparam.h> #include <linux/delay.h> -#include <linux/wait.h> #include <sound/rawmidi.h> #include <sound/info.h> #include <sound/control.h>
sound/oss/rme96xx.c +0 -1
@@ -55,7 +55,6 @@ TODO:#include <linux/slab.h> #include <linux/interrupt.h> #include <linux/init.h> -#include <linux/interrupt.h> #include <linux/poll.h> #include <linux/wait.h>
[PATCH/RFC] remove duplicate #includes, take II, part B
In reply to Herbert Poetzlproblematic hunks
---
arch/h8300/kernel/gpio.c +0 -1
@@ -29,7 +29,6 @@ static volatile unsigned char *ddrs[] =#if defined(CONFIG_H83002 ) || defined(CONFIG_H8048 )/* Fix me!! */ -#include <asm/regs306x.h> static volatile unsigned char *ddrs[] = {_ (P1DDR ),_ (P2DDR ),_ (P3DDR ),_ (P4DDR ),_ (P5DDR ),_ (P6DDR ), NULL, _(P8DDR),_(P9DDR),_(PADDR),_(PBDDR),
arch/mips/mips-boards/generic/time.c +0 -1
@@ -42,7 +42,6 @@#include <asm/mips-boards/generic.h> #include <asm/mips-boards/prom.h> #include <asm/mips-boards/maltaint.h> -#include <asm/mc146818-time.h> unsigned long cpu_khz;
arch/mips/sibyte/bcm1480/time.c +0 -1
@@ -99,7 +99,6 @@ void bcm1480_time_init(void)*/ } -#include <asm/sibyte/sb1250.h> void bcm1480_timer_interrupt (struct pt_regs *regs) {
arch/powerpc/kernel/signal_32.c +0 -1
@@ -32,7 +32,6 @@#include <linux/ptrace.h> #else #include <linux/wait.h> -#include <linux/ptrace.h> #include <linux/unistd.h> #include <linux/stddef.h> #include <linux/tty.h>
arch/powerpc/platforms/powermac/setup.c +0 -1
@@ -96,7 +96,6 @@ extern struct machdep_calls pmac_md;#define DEFAULT_ROOT_DEVICE Root_SDA1/* sda1 - slightly silly choice */ #ifdef CONFIG_PPC64 -#include <asm/udbg.h> int sccdbg;#endif
arch/ppc/syslib/ppc83xx_setup.c +0 -1
@@ -44,7 +44,6 @@#include <syslib/ppc83xx_setup.h> #if defined(CONFIG_PCI ) -#include <asm/delay.h> #include <syslib/ppc83xx_pci.h> #endif
arch/sh64/kernel/process.c +0 -1
@@ -897,7 +897,6 @@ unsigned long get_wchan(struct task_stru*/ #if defined(CONFIG_SH64_PROC_ASIDS ) -#include <linux/init.h> #include <linux/proc_fs.h> static int
arch/sh64/kernel/setup.c +0 -1
@@ -60,7 +60,6 @@#include <asm/smp.h> #ifdef CONFIG_VT -#include <linux/console.h> #endif struct screen_info screen_info;
drivers/char/drm/drm.h +0 -1
@@ -54,7 +54,6 @@#include <sys/ioccom.h> #define ioctl (a,b,c) xf86ioctl(a,b,c)#else -#include <sys/ioccom.h> #endif /* __FreeBSD__ && xf86ioctl */ #define DRM_IOCTL_NR (n) ((n) & 0xff)#define DRM_IOC_VOID IOC_VOID
drivers/input/serio/i8042-io.h +0 -1
@@ -26,7 +26,6 @@/* defined in include/asm-arm/arch-xxx/irqs.h */ #include <asm/irq.h> #elif defined(CONFIG_SUPERH64 ) -#include <asm/irq.h> #else # define I8042_KBD_IRQ 1# define I8042_AUX_IRQ 12
drivers/media/video/zr36016.c +0 -1
@@ -42,7 +42,6 @@//#include<errno.h> /* v4l API */ -#include <linux/videodev.h> /* headerfile of this module */ #include "zr36016.h"
drivers/net/cs89x0.c +0 -1
@@ -189,7 +189,6 @@ static unsigned int cs8900_irq_map[] = {static unsigned int netcard_portlist[]__initdata = {IXDP2X01_CS8900_VIRT_BASE ,0 };static unsigned int cs8900_irq_map[] = {IRQ_IXDP2X01_CS8900 ,0 ,0 ,0 };#elif defined(CONFIG_ARCH_PNX010X ) -#include <asm/irq.h> #include <asm/arch/gpio.h> #define CIRRUS_DEFAULT_BASE IO_ADDRESS(EXT_STATIC2_s0_BASE + 0x200000)/* = Physical address 0x48200000 */ #define CIRRUS_DEFAULT_IRQ VH_INTC_INT_NUM_CASCADED_INTERRUPT_1/* Event inputs bank 1 - ID 35/bit 3 */
drivers/video/fbmon.c +0 -1
@@ -1282,7 +1282,6 @@ int fb_validate_mode(const struct fb_var }#if defined(__i386__) -#include <linux/pci.h> /* * We need to ensure that the EDID block is only returned for
include/asm-arm/arch-clps711x/hardware.h +0 -1
@@ -180,7 +180,6 @@#define CEIVA_BASE CLPS7111_VIRT_BASE#include <asm/hardware/clps7111.h> -#include <asm/hardware/ep7212.h> /*
include/asm-arm26/signal.h +0 -1
@@ -170,7 +170,6 @@ typedef struct sigaltstack {#ifdef __KERNEL__ -#include <asm/sigcontext.h> #define ptrace_signal_deliver (regs, cookie) do { } while (0)#endif
include/asm-m32r/m32r.h +0 -1
@@ -40,7 +40,6 @@#endif /* CONFIG_PLAT_MAPPI3 */ #if defined(CONFIG_PLAT_USRV ) -#include <asm/m32700ut/m32700ut_pld.h> #endif #if defined(CONFIG_PLAT_M32104UT )
include/asm-ia64/unistd.h +0 -1
@@ -316,7 +316,6 @@ extern long __ia64_syscall (long a0, lon#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 +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/serial.h +0 -1
@@ -91,7 +91,6 @@#endif #ifdef CONFIG_MIPS_IVR -#include <asm/it8172/it8172.h> #include <asm/it8172/it8172_int.h> #define IVR_SERIAL_PORT_DEFNS \ { .baud_base = BASE_BAUD, .port = (IT8172_PCI_IO_BASE + IT_UART_BASE), \
include/asm-x86_64/smp.h +0 -1
@@ -120,7 +120,6 @@ static inline int cpu_present_to_apicid(#define safe_smp_processor_id () 0#define cpu_logical_map (x) (x)#else -#include <asm/thread_info.h> #define stack_smp_processor_id () \ ({ \ struct thread_info *ti; \
include/linux/aio.h +0 -1
@@ -236,7 +236,6 @@ do { \#define io_wait_to_kiocb (wait) container_of(wait, struct kiocb, ki_wait)#define is_retried_kiocb (iocb) ((iocb)->ki_retried > 1) -#include <linux/aio_abi.h> static inline struct kiocb *list_kiocb (struct list_head *h) {
include/linux/udp.h +0 -1
@@ -36,7 +36,6 @@ struct udphdr {#ifdef __KERNEL__#include <linux/config.h> -#include <linux/types.h> #include <net/inet_sock.h>
Re: [PATCH/RFC] remove duplicate #includes, take II, part B
include/asm-arm/arch-clps711x/hardware.h line 185
Quoted 11 lines · Herbert Poetzl
diff -NurpP
linux-2.6.16-rc4/include/asm-arm/arch-clps711x/hardware.hlinux-2.6.16-rc4-rmd/include/asm-arm/arch-clps711x/hardware.hinclude/asm-arm/arch-clps711x/hardware.h +0
-1@@ -180,7 +180,6 @@#define CEIVA_BASE CLPS7111_VIRT_BASE#include <asm/hardware/clps7111.h> -#include <asm/hardware/ep7212.h> /*
This looks like a candidate for probably wrong. (I'm not convinced myself because it relies on too many config variables.)
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
[PATCH/RFC] remove duplicate #includes, take II, part C
In reply to Herbert Poetzlthe wrong ones
---
mm/slab.c +0 -1
@@ -626,7 +626,6 @@ struct cache_names { static struct cache_names __initdata cache_names[] = { #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" }, -#include <linux/kmalloc_sizes.h> {NULL,}#undef CACHE };
arch/um/sys-x86_64/syscall_table.c +0 -1
@@ -55,5 +55,4 @@ extern void sys_ni_syscall(void); sys_call_ptr_t sys_call_table[__NR_syscall_max+1] __cacheline_aligned = {/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */ [0 ... __NR_syscall_max] = &sys_ni_syscall, -#include <asm-x86_64/unistd.h> };
arch/x86_64/kernel/syscall.c +0 -1
@@ -22,5 +22,4 @@ extern void sys_ni_syscall(void);const sys_call_ptr_t sys_call_table[__NR_syscall_max+1 ] = {/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */ [0 ... __NR_syscall_max] = &sys_ni_syscall, -#include <asm-x86_64/unistd.h> };
Benjamin LaHaise
maintainerQuoted 4 lines · Herbert Poetzl
so if folks want to cherry pick and/or comment on the first two categories, please do so, I will collect all the feedback and produce a patch to get rid of the duplicates later ...
This sort of patch isn't as interesting as actually fixing the mess known as include/linux/sched.h and include/linux/sched.h... Most places in the kernel don't actually need the majority of sched.h, just a handful of functions like set_task_state(). fs.h is another tangled web of dependancies. I did some experimenting back in the 2.2 days and it was possible to cut something like 10-20% off the kernel build time.
That said, it's a big job.
-ben
Signature · 2 lines
"Ladies and gentlemen, I'm sorry to interrupt, but the police are here and they've asked us to stop the party." Don't Email: <[email protected]>.