Skip to contentSkip to conversation

remove duplicate #includes

PATCH In review Herbert Poetzl 6 participants 9 messages Feb 13, 2006 – Feb 15, 2006

Subsystems (45)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove duplicate #includes

Hi Andrew! Folks!

recently I stumbled over a few files which #include the same .h file twice -- sometimes even in the immediately following line. so I thought I'd look into that to reduce the amount of duplicate includes in the kernel ...

I first searched for 'potential' duplicates with the following command sequence ...

  find . -type f -name '*.[hcS]' -exec gawk '/^#include/ { X[$2]++ } END { for (n in X) if (X[n]>1) printf("%s: %s[%d]\n",FILENAME,n,X[n]); }' {} \;

.. then, I inspected each of the results, and if it was valid, I removed every but the first occurence (of course only after detailed inspection)

I will do a bunch of further tests with this patch to make absolutely 100% sure that there are no bad changes. the patch contains the obvious cases first, and the not so obvious ones at the end.

best,
Herbert

---

arch/alpha/kernel/setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/alpha/kernel/setup.c linux-2.6.16-rc2-mpf/arch/alpha/kernel/setup.c
@@ -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/arm/mach-iop3xx/iop321-setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c
@@ -13,7 +13,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/platform_device.h>
arch/arm/mach-iop3xx/iop331-setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c
@@ -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/platform_device.h>
arch/arm/plat-omap/pm.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/plat-omap/pm.c linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c
@@ -38,7 +38,6 @@
 #include <linux/pm.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 
 #include <asm/io.h>
arch/arm26/kernel/armksyms.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/arm26/kernel/armksyms.c linux-2.6.16-rc2-mpf/arch/arm26/kernel/armksyms.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/cris/arch-v32/mm/init.c linux-2.6.16-rc2-mpf/arch/cris/arch-v32/mm/init.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/i386/kernel/cpuid.c linux-2.6.16-rc2-mpf/arch/i386/kernel/cpuid.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/ia32/ia32priv.h linux-2.6.16-rc2-mpf/arch/ia64/ia32/ia32priv.h
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/ia32/sys_ia32.c linux-2.6.16-rc2-mpf/arch/ia64/ia32/sys_ia32.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/kernel/setup.c linux-2.6.16-rc2-mpf/arch/ia64/kernel/setup.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/kernel/time.c linux-2.6.16-rc2-mpf/arch/ia64/kernel/time.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ia64/sn/kernel/setup.c linux-2.6.16-rc2-mpf/arch/ia64/sn/kernel/setup.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/m68knommu/platform/5206e/config.c linux-2.6.16-rc2-mpf/arch/m68knommu/platform/5206e/config.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/kernel/signal_n32.c linux-2.6.16-rc2-mpf/arch/mips/kernel/signal_n32.c
@@ -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/generic/time.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/mips-boards/generic/time.c linux-2.6.16-rc2-mpf/arch/mips/mips-boards/generic/time.c
@@ -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/mips-boards/sim/sim_time.c +0 -7
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/mips-boards/sim/sim_time.c linux-2.6.16-rc2-mpf/arch/mips/mips-boards/sim/sim_time.c
@@ -15,20 +15,13 @@
 #include <linux/interrupt.h>
 #include <linux/mc146818rtc.h>
 #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>
-#include <asm/time.h>
 #include <asm/mc146818-time.h>
 #include <asm/msc01_ic.h>
 
 #include <asm/mips-boards/generic.h>
 #include <asm/mips-boards/prom.h>
 #include <asm/mips-boards/simint.h>
-#include <asm/mc146818-time.h>
 #include <asm/smp.h>
 
 
arch/mips/sibyte/bcm1480/time.c +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/sibyte/bcm1480/time.c linux-2.6.16-rc2-mpf/arch/mips/sibyte/bcm1480/time.c
@@ -99,8 +99,6 @@ void bcm1480_time_init(void)
 	 */
 }
 
-#include <asm/sibyte/sb1250.h>
-
 void bcm1480_timer_interrupt(struct pt_regs *regs)
 {
 	int cpu = smp_processor_id();
arch/mips/tx4938/common/setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/mips/tx4938/common/setup.c linux-2.6.16-rc2-mpf/arch/mips/tx4938/common/setup.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/parisc/kernel/signal.c linux-2.6.16-rc2-mpf/arch/parisc/kernel/signal.c
@@ -24,7 +24,6 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
-#include <linux/compat.h>
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <asm/ucontext.h>
arch/powerpc/kernel/btext.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/btext.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/btext.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/iommu.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/iommu.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/time.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/time.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/hash_utils_64.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/hash_utils_64.c
@@ -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 -3
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/hugetlbpage.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/hugetlbpage.c
@@ -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>
 
 #define NUM_LOW_AREAS	(0x100000000UL >> SID_SHIFT)
 #define NUM_HIGH_AREAS	(PGTABLE_RANGE >> HTLB_AREA_SHIFT)
arch/powerpc/mm/init_32.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/init_32.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/init_32.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/mm/mem.c linux-2.6.16-rc2-mpf/arch/powerpc/mm/mem.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/cell/iommu.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/cell/iommu.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/chrp/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/chrp/setup.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/chrp/smp.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/chrp/smp.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/iseries/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/iseries/setup.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/low_i2c.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/low_i2c.c
@@ -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/setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c
@@ -76,7 +76,6 @@
 #include <asm/smu.h>
 #include <asm/pmc.h>
 #include <asm/lmb.h>
-#include <asm/udbg.h>
 
 #include "pmac.h"
 
arch/powerpc/platforms/powermac/udbg_adb.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/udbg_adb.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/udbg_adb.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/pseries/lpar.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/pseries/lpar.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/platforms/85xx/stx_gp3.c linux-2.6.16-rc2-mpf/arch/ppc/platforms/85xx/stx_gp3.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/platforms/chrp_setup.c linux-2.6.16-rc2-mpf/arch/ppc/platforms/chrp_setup.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/gt64260_pic.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/gt64260_pic.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/mpc52xx_pic.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/mpc52xx_pic.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/mv64360_pic.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/mv64360_pic.c
@@ -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/syslib/ppc83xx_setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/syslib/ppc83xx_setup.c linux-2.6.16-rc2-mpf/arch/ppc/syslib/ppc83xx_setup.c
@@ -44,7 +44,6 @@
 
 #include <syslib/ppc83xx_setup.h>
 #if defined(CONFIG_PCI)
-#include <asm/delay.h>
 #include <syslib/ppc83xx_pci.h>
 #endif
 
arch/ppc/xmon/start.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/ppc/xmon/start.c linux-2.6.16-rc2-mpf/arch/ppc/xmon/start.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh/kernel/sh_ksyms.c linux-2.6.16-rc2-mpf/arch/sh/kernel/sh_ksyms.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh/kernel/smp.c linux-2.6.16-rc2-mpf/arch/sh/kernel/smp.c
@@ -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/setup.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/setup.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/setup.c
@@ -44,7 +44,6 @@
 #include <linux/seq_file.h>
 #include <linux/blkdev.h>
 #include <linux/bootmem.h>
-#include <linux/console.h>
 #include <linux/root_dev.h>
 #include <linux/cpu.h>
 #include <linux/initrd.h>
arch/sh64/kernel/signal.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/signal.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/signal.c
@@ -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 -2
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/traps.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/traps.c
@@ -244,8 +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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc/kernel/irq.c linux-2.6.16-rc2-mpf/arch/sparc/kernel/irq.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/module.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/module.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/process.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/process.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/sys_sparc32.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/sys_sparc32.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/sys_sunos32.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/sys_sunos32.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/sparc64/kernel/time.c linux-2.6.16-rc2-mpf/arch/sparc64/kernel/time.c
@@ -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/um/kernel/trap_kern.c +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/arch/um/kernel/trap_kern.c linux-2.6.16-rc2-mpf/arch/um/kernel/trap_kern.c
@@ -26,13 +26,11 @@
 #include "mconsole_kern.h"
 #include "mem.h"
 #include "mem_kern.h"
-#include "sysdep/sigcontext.h"
 #include "sysdep/ptrace.h"
 #include "os.h"
 #ifdef CONFIG_MODE_SKAS
 #include "skas.h"
 #endif
-#include "os.h"
 
 /* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */
 int handle_page_fault(unsigned long address, unsigned long ip, 
arch/x86_64/kernel/x8664_ksyms.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/x86_64/kernel/x8664_ksyms.c linux-2.6.16-rc2-mpf/arch/x86_64/kernel/x8664_ksyms.c
@@ -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/x86_64/mm/fault.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/x86_64/mm/fault.c linux-2.6.16-rc2-mpf/arch/x86_64/mm/fault.c
@@ -33,7 +33,6 @@
 #include <asm/proto.h>
 #include <asm/kdebug.h>
 #include <asm-generic/sections.h>
-#include <asm/kdebug.h>
 
 /* Page fault error code bits */
 #define PF_PROT	(1<<0)		/* or no page found */
arch/xtensa/kernel/align.S +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/kernel/align.S linux-2.6.16-rc2-mpf/arch/xtensa/kernel/align.S
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/kernel/asm-offsets.c linux-2.6.16-rc2-mpf/arch/xtensa/kernel/asm-offsets.c
@@ -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 -2
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/kernel/vectors.S linux-2.6.16-rc2-mpf/arch/xtensa/kernel/vectors.S
@@ -44,14 +44,12 @@
 
 #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>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/thread_info.h>
-#include <asm/processor.h>
 
 
 /*
arch/xtensa/mm/init.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/mm/init.c linux-2.6.16-rc2-mpf/arch/xtensa/mm/init.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/platform-iss/console.c linux-2.6.16-rc2-mpf/arch/xtensa/platform-iss/console.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/arch/xtensa/platform-iss/network.c linux-2.6.16-rc2-mpf/arch/xtensa/platform-iss/network.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/atm/lanai.c linux-2.6.16-rc2-mpf/drivers/atm/lanai.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/block/viodasd.c linux-2.6.16-rc2-mpf/drivers/block/viodasd.c
@@ -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/lcd.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/lcd.c linux-2.6.16-rc2-mpf/drivers/char/lcd.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/ppdev.c linux-2.6.16-rc2-mpf/drivers/char/ppdev.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/synclink.c linux-2.6.16-rc2-mpf/drivers/char/synclink.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/input/gameport/gameport.c linux-2.6.16-rc2-mpf/drivers/input/gameport/gameport.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c
@@ -104,7 +104,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>
drivers/media/video/arv.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/drivers/media/video/arv.c linux-2.6.16-rc2-mpf/drivers/media/video/arv.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/mtd/chips/jedec_probe.c linux-2.6.16-rc2-mpf/drivers/mtd/chips/jedec_probe.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/mtd/devices/m25p80.c linux-2.6.16-rc2-mpf/drivers/mtd/devices/m25p80.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/bonding/bond_sysfs.c linux-2.6.16-rc2-mpf/drivers/net/bonding/bond_sysfs.c
@@ -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 -2
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/fs_enet/fs_enet-main.c linux-2.6.16-rc2-mpf/drivers/net/fs_enet/fs_enet-main.c
@@ -41,8 +41,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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/gianfar.h linux-2.6.16-rc2-mpf/drivers/net/gianfar.h
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/gianfar_ethtool.c linux-2.6.16-rc2-mpf/drivers/net/gianfar_ethtool.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/mipsnet.c linux-2.6.16-rc2-mpf/drivers/net/mipsnet.c
@@ -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/via-velocity.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/via-velocity.c linux-2.6.16-rc2-mpf/drivers/net/via-velocity.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/wireless/ipw2200.h linux-2.6.16-rc2-mpf/drivers/net/wireless/ipw2200.h
@@ -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/scsi/NCR_D700.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/drivers/scsi/NCR_D700.c linux-2.6.16-rc2-mpf/drivers/scsi/NCR_D700.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/scsi/seagate.c linux-2.6.16-rc2-mpf/drivers/scsi/seagate.c
@@ -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/video/fbmem.c +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/fbmem.c linux-2.6.16-rc2-mpf/drivers/video/fbmem.c
@@ -26,7 +26,6 @@
 #include <linux/mman.h>
 #include <linux/tty.h>
 #include <linux/init.h>
-#include <linux/linux_logo.h>
 #include <linux/proc_fs.h>
 #include <linux/console.h>
 #ifdef CONFIG_KMOD
@@ -34,7 +33,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/s3c2410fb.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/s3c2410fb.c linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c
@@ -82,7 +82,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
-#include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/wait.h>
drivers/video/tgafb.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/tgafb.c linux-2.6.16-rc2-mpf/drivers/video/tgafb.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/drivers/w1/matrox_w1.c linux-2.6.16-rc2-mpf/drivers/w1/matrox_w1.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/fs/compat_ioctl.c linux-2.6.16-rc2-mpf/fs/compat_ioctl.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/fs/namei.c linux-2.6.16-rc2-mpf/fs/namei.c
@@ -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-ia64/pgtable.h +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-ia64/pgtable.h linux-2.6.16-rc2-mpf/include/asm-ia64/pgtable.h
@@ -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/linux/memory_hotplug.h +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/memory_hotplug.h linux-2.6.16-rc2-mpf/include/linux/memory_hotplug.h
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/nfs_fs.h linux-2.6.16-rc2-mpf/include/linux/nfs_fs.h
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/include/net/ieee80211.h linux-2.6.16-rc2-mpf/include/net/ieee80211.h
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/kernel/kexec.c linux-2.6.16-rc2-mpf/kernel/kexec.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/kernel/profile.c linux-2.6.16-rc2-mpf/kernel/profile.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/kernel/rcupdate.c linux-2.6.16-rc2-mpf/kernel/rcupdate.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/kernel/rcutorture.c linux-2.6.16-rc2-mpf/kernel/rcutorture.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/kernel/sysctl.c linux-2.6.16-rc2-mpf/kernel/sysctl.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/kernel/time.c linux-2.6.16-rc2-mpf/kernel/time.c
@@ -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 -2
diff -NurpP --minimal linux-2.6.16-rc2/mm/mempolicy.c linux-2.6.16-rc2-mpf/mm/mempolicy.c
@@ -72,7 +72,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>
@@ -82,7 +81,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 -2
diff -NurpP --minimal linux-2.6.16-rc2/mm/swap.c linux-2.6.16-rc2-mpf/mm/swap.c
@@ -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;
net/atm/lec.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/net/atm/lec.c linux-2.6.16-rc2-mpf/net/atm/lec.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/net/bridge/netfilter/ebt_log.c linux-2.6.16-rc2-mpf/net/bridge/netfilter/ebt_log.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/in.h>
 #include <linux/netfilter_bridge/ebtables.h>
 #include <linux/netfilter_bridge/ebt_log.h>
 #include <linux/netfilter.h>
net/bridge/netfilter/ebt_ulog.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/net/bridge/netfilter/ebt_ulog.c linux-2.6.16-rc2-mpf/net/bridge/netfilter/ebt_ulog.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/ip_output.c linux-2.6.16-rc2-mpf/net/ipv4/ip_output.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/ipvs/ip_vs_ctl.c linux-2.6.16-rc2-mpf/net/ipv4/ipvs/ip_vs_ctl.c
@@ -26,7 +26,6 @@
 #include <linux/capability.h>
 #include <linux/fs.h>
 #include <linux/sysctl.h>
-#include <linux/proc_fs.h>
 #include <linux/workqueue.h>
 #include <linux/swap.h>
 #include <linux/proc_fs.h>
net/ipv4/netfilter/ipt_CLUSTERIP.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/netfilter/ipt_CLUSTERIP.c linux-2.6.16-rc2-mpf/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -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/ipv6/tcp_ipv6.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv6/tcp_ipv6.c linux-2.6.16-rc2-mpf/net/ipv6/tcp_ipv6.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/net/netfilter/nf_conntrack_proto_tcp.c linux-2.6.16-rc2-mpf/net/netfilter/nf_conntrack_proto_tcp.c
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
-#include <linux/netfilter.h>
 #include <linux/module.h>
 #include <linux/in.h>
 #include <linux/tcp.h>
net/netfilter/nf_conntrack_proto_udp.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/net/netfilter/nf_conntrack_proto_udp.c linux-2.6.16-rc2-mpf/net/netfilter/nf_conntrack_proto_udp.c
@@ -15,7 +15,6 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/module.h>
-#include <linux/netfilter.h>
 #include <linux/udp.h>
 #include <linux/seq_file.h>
 #include <linux/skbuff.h>
net/sched/act_police.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/net/sched/act_police.c linux-2.6.16-rc2-mpf/net/sched/act_police.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/net/sunrpc/auth_gss/svcauth_gss.c linux-2.6.16-rc2-mpf/net/sunrpc/auth_gss/svcauth_gss.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/net/wanrouter/wanmain.c linux-2.6.16-rc2-mpf/net/wanrouter/wanmain.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/sound/core/rawmidi.c linux-2.6.16-rc2-mpf/sound/core/rawmidi.c
@@ -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
diff -NurpP --minimal linux-2.6.16-rc2/sound/oss/rme96xx.c linux-2.6.16-rc2-mpf/sound/oss/rme96xx.c
@@ -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>
 
arch/powerpc/kernel/signal_32.c +1 -2
diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/kernel/signal_32.c linux-2.6.16-rc2-mpf/arch/powerpc/kernel/signal_32.c
@@ -26,13 +26,12 @@
 #include <linux/signal.h>
 #include <linux/errno.h>
 #include <linux/elf.h>
+#include <linux/ptrace.h>
 #ifdef CONFIG_PPC64
 #include <linux/syscalls.h>
 #include <linux/compat.h>
-#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>
net/ipv4/tcp_cubic.c +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/net/ipv4/tcp_cubic.c linux-2.6.16-rc2-mpf/net/ipv4/tcp_cubic.c
@@ -52,8 +52,6 @@ MODULE_PARM_DESC(bic_scale, "scale (scal
 module_param(tcp_friendliness, int, 0644);
 MODULE_PARM_DESC(tcp_friendliness, "turn on/off tcp friendliness");
 
-#include <asm/div64.h>
-
 /* BIC TCP Parameters */
 struct bictcp {
 	u32	cnt;		/* increase cwnd by 1 after ACKs */
mm/swapfile.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/mm/swapfile.c linux-2.6.16-rc2-mpf/mm/swapfile.c
@@ -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;
include/linux/udp.h +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/udp.h linux-2.6.16-rc2-mpf/include/linux/udp.h
@@ -36,7 +36,6 @@ struct udphdr {
 
 #ifdef __KERNEL__
 #include <linux/config.h>
-#include <linux/types.h>
 
 #include <net/inet_sock.h>
 
include/asm-ia64/unistd.h +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-ia64/unistd.h linux-2.6.16-rc2-mpf/include/asm-ia64/unistd.h
@@ -301,7 +301,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-ppc/page.h +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-ppc/page.h linux-2.6.16-rc2-mpf/include/asm-ppc/page.h
@@ -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 -2
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-sparc/system.h linux-2.6.16-rc2-mpf/include/asm-sparc/system.h
@@ -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/linux/aio.h +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/aio.h linux-2.6.16-rc2-mpf/include/linux/aio.h
@@ -236,8 +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)
 {
 	return list_entry(h, struct kiocb, ki_list);
include/linux/atalk.h +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/include/linux/atalk.h linux-2.6.16-rc2-mpf/include/linux/atalk.h
@@ -85,8 +85,6 @@ static inline struct atalk_sock *at_sk(s
 	return (struct atalk_sock *)sk;
 }
 
-#include <asm/byteorder.h>
-
 struct ddpehdr {
 #ifdef __LITTLE_ENDIAN_BITFIELD
 	__u16	deh_len:10,
include/asm-arm26/signal.h +0 -5
diff -NurpP --minimal linux-2.6.16-rc2/include/asm-arm26/signal.h linux-2.6.16-rc2-mpf/include/asm-arm26/signal.h
@@ -166,11 +166,6 @@ typedef struct sigaltstack {
 #include <asm/sigcontext.h>
 
 #define sigmask(sig)	(1UL << ((sig) - 1))
-#endif
-
-
-#ifdef __KERNEL__
-#include <asm/sigcontext.h>
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif
 
drivers/net/cs89x0.c +0 -3
diff -NurpP --minimal linux-2.6.16-rc2/drivers/net/cs89x0.c linux-2.6.16-rc2-mpf/drivers/net/cs89x0.c
@@ -183,13 +183,10 @@ static unsigned int cs8900_irq_map[] = {
 #elif defined(CONFIG_MACH_IXDP2351)
 static unsigned int netcard_portlist[] __initdata = {IXDP2351_VIRT_CS8900_BASE, 0};
 static unsigned int cs8900_irq_map[] = {IRQ_IXDP2351_CS8900, 0, 0, 0};
-#include <asm/irq.h>
 #elif defined(CONFIG_ARCH_IXDP2X01)
-#include <asm/irq.h>
 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/char/drm/drm.h +1 -3
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h
@@ -51,11 +51,9 @@
 #if defined(__FreeBSD__) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
-#include <sys/ioccom.h>
 #define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
 #endif				/* __FreeBSD__ && xf86ioctl */
+#include <sys/ioccom.h>
 #define DRM_IOCTL_NR(n)		((n) & 0xff)
 #define DRM_IOC_VOID		IOC_VOID
 #define DRM_IOC_READ		IOC_OUT
drivers/char/drm/drm_memory.h +0 -2
diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm_memory.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm_memory.h
@@ -45,8 +45,6 @@
 
 #if __OS_HAS_AGP
 
-#include <linux/vmalloc.h>
-
 #ifdef HAVE_PAGE_AGP
 #include <asm/agp.h>
 #else
arch/sh64/kernel/process.c +0 -1
diff -NurpP --minimal linux-2.6.16-rc2/arch/sh64/kernel/process.c linux-2.6.16-rc2-mpf/arch/sh64/kernel/process.c
@@ -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
#1 lore raw
Quoted 6 lines · Herbert Poetzl

diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h

drivers/char/drm/drm.h +0 -0
@@ -51,11 +51,9 @@
 #if defined(__FreeBSD__) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */

drivers/char/drm/drm.h line 59

Quoted 10 lines
drivers/char/drm/drm.h +1 -3
 #undef ioctl
-#include <sys/ioccom.h>
 #define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
 #endif				/* __FreeBSD__ && xf86ioctl */
+#include <sys/ioccom.h>
 #define DRM_IOCTL_NR(n)		((n) & 0xff)
 #define DRM_IOC_VOID		IOC_VOID
 #define DRM_IOC_READ		IOC_OUT

This one changes the behaviour. But do we want to have this non-linux hacks in the tree?

Bastian

Signature · 2 lines
It would be illogical to assume that all conditions remain stable.
		-- Spock, "The Enterprise Incident", stardate 5027.3
#2 lore raw
Quoted 11 lines · Bastian Blank
Quoted 10 lines · Herbert Poetzl

diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h

drivers/char/drm/drm.h +0 -2
@@ -51,11 +51,9 @@
 #if defined(__FreeBSD__) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
-#include <sys/ioccom.h>
 #define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
Quoted 8 lines

drivers/char/drm/drm.h line 59

Quoted 6 lines
drivers/char/drm/drm.h +1 -1
-#include <sys/ioccom.h>
 #endif				/* __FreeBSD__ && xf86ioctl */
+#include <sys/ioccom.h>
 #define DRM_IOCTL_NR(n)		((n) & 0xff)
 #define DRM_IOC_VOID		IOC_VOID
 #define DRM_IOC_READ		IOC_OUT

This one changes the behaviour.

hmm, yes, doesn't make much sense to remove that
dumplicate entry anyway, so I'll simply drop that
one from the patch ...

thanks a lot for the feedback!

Quoted 1 line

But do we want to have this non-linux hacks in the tree?

good question

best,
Herbert

Quoted 5 lines

Bastian

Signature · 2 lines
It would be illogical to assume that all conditions remain stable.
		-- Spock, "The Enterprise Incident", stardate 5027.3
#3 lore raw
In reply to Herbert Poetzl
Quoted 8 lines · Herbert Poetzl

Hi Andrew! Folks!

recently I stumbled over a few files which #include the same .h file twice -- sometimes even in the immediately following line. so I thought I'd look into that to reduce the amount of duplicate includes in the kernel ...

Quoted 4 lines

I first searched for 'potential' duplicates with the following command sequence ...

  find . -type f -name '*.[hcS]' -exec gawk '/^#include/ { X[$2]++ } END { for (n in X) if (X[n]>1) printf("%s: %s[%d]\n",FILENAME,n,X[n]); }' {} \;

scripts/checkincludes.pl ;-)

Quoted 8 lines

.. then, I inspected each of the results, and if it was valid, I removed every but the first occurence (of course only after detailed inspection)

I will do a bunch of further tests with this patch to make absolutely 100% sure that there are no bad changes. the patch contains the obvious cases first, and the not so obvious ones at the end.

Please, please, split this into smaller, readable chunks. As is, it is bound to break patches queued up in -mm and other subsystem trees. You don't want the angry mob coming after you, really.

[snip]

arch/parisc/kernel/signal.c line 27

Quoted 7 lines
arch/parisc/kernel/signal.c +0 -1
@@ -24,7 +24,6 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
-#include <linux/compat.h>

Second occurrence is the redundant one here; include/linux/compat.h already wrapped around #ifdef CONFIG_COMPAT ..

Quoted 3 lines
arch/parisc/kernel/signal.c +0 -0
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <asm/ucontext.h>

[snip]

arch/powerpc/platforms/powermac/setup.c line 79

Quoted 8 lines

diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c

arch/powerpc/platforms/powermac/setup.c +0 -1
@@ -76,7 +76,6 @@
 #include <asm/smu.h>
 #include <asm/pmc.h>
 #include <asm/lmb.h>
-#include <asm/udbg.h>

You broke CONFIG_PPC_PMAC when CONFIG_PPC64=n

Quoted 2 lines
arch/powerpc/platforms/powermac/setup.c +0 -0
 #include "pmac.h"
 

[snip]

drivers/char/drm/drm.h line 56

Quoted 13 lines

diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h

drivers/char/drm/drm.h +1 -3
@@ -51,11 +51,9 @@
 #if defined(__FreeBSD__) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
-#include <sys/ioccom.h>
 #define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
 #endif				/* __FreeBSD__ && xf86ioctl */
+#include <sys/ioccom.h>

This changes semantics, like Bastian pointed out..

Quoted 3 lines
drivers/char/drm/drm.h +0 -0
 #define DRM_IOCTL_NR(n)		((n) & 0xff)
 #define DRM_IOC_VOID		IOC_VOID
 #define DRM_IOC_READ		IOC_OUT
#4 lore raw
Quoted 9 lines · Arthur Othieno
Quoted 8 lines · Herbert Poetzl

Hi Andrew! Folks!

recently I stumbled over a few files which #include the same .h file twice -- sometimes even in the immediately following line. so I thought I'd look into that to reduce the amount of duplicate includes in the kernel ...

Quoted 6 lines
Quoted 4 lines

I first searched for 'potential' duplicates with the following command sequence ...

  find . -type f -name '*.[hcS]' -exec gawk '/^#include/ { X[$2]++ } END { for (n in X) if (X[n]>1) printf("%s: %s[%d]\n",FILENAME,n,X[n]); }' {} \;

scripts/checkincludes.pl ;-)

darn! I knew it was there, but I could not remember where I saw it! thanks for the hint with the cluebat

Quoted 4 lines
Quoted 4 lines

.. then, I inspected each of the results, and if it was valid, I removed every but the first occurence (of course only after detailed inspection)

Quoted 8 lines
Quoted 4 lines

I will do a bunch of further tests with this patch to make absolutely 100% sure that there are no bad changes. the patch contains the obvious cases first, and the not so obvious ones at the end.

Please, please, split this into smaller, readable chunks. As is, it is bound to break patches queued up in -mm and other subsystem trees. You don't want the angry mob coming after you, really.

okay, maybe a good idea .. for now it was just to
get an idea how many worms are in this can :)

thanks,
Herbert

Quoted 54 lines

[snip]

arch/parisc/kernel/signal.c line 27

Quoted 7 lines
arch/parisc/kernel/signal.c +0 -1
@@ -24,7 +24,6 @@
 #include <linux/ptrace.h>
 #include <linux/unistd.h>
 #include <linux/stddef.h>
-#include <linux/compat.h>

Second occurrence is the redundant one here; include/linux/compat.h already wrapped around #ifdef CONFIG_COMPAT ..

Quoted 3 lines
arch/parisc/kernel/signal.c +0 -0
 #include <linux/elf.h>
 #include <linux/personality.h>
 #include <asm/ucontext.h>

[snip]

arch/powerpc/platforms/powermac/setup.c line 79

Quoted 8 lines

diff -NurpP --minimal linux-2.6.16-rc2/arch/powerpc/platforms/powermac/setup.c linux-2.6.16-rc2-mpf/arch/powerpc/platforms/powermac/setup.c

arch/powerpc/platforms/powermac/setup.c +0 -1
@@ -76,7 +76,6 @@
 #include <asm/smu.h>
 #include <asm/pmc.h>
 #include <asm/lmb.h>
-#include <asm/udbg.h>

You broke CONFIG_PPC_PMAC when CONFIG_PPC64=n

Quoted 2 lines
arch/powerpc/platforms/powermac/setup.c +0 -0
 #include "pmac.h"
 

[snip]

drivers/char/drm/drm.h line 56

Quoted 13 lines

diff -NurpP --minimal linux-2.6.16-rc2/drivers/char/drm/drm.h linux-2.6.16-rc2-mpf/drivers/char/drm/drm.h

drivers/char/drm/drm.h +1 -3
@@ -51,11 +51,9 @@
 #if defined(__FreeBSD__) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
-#include <sys/ioccom.h>
 #define ioctl(a,b,c)		xf86ioctl(a,b,c)
-#else
-#include <sys/ioccom.h>
 #endif				/* __FreeBSD__ && xf86ioctl */
+#include <sys/ioccom.h>

This changes semantics, like Bastian pointed out..

Quoted 3 lines
drivers/char/drm/drm.h +0 -0
 #define DRM_IOCTL_NR(n)		((n) & 0xff)
 #define DRM_IOC_VOID		IOC_VOID
 #define DRM_IOC_READ		IOC_OUT
#5 lore raw
In reply to Herbert Poetzl

Hi Herbert,

Quoted 9 lines

recently I stumbled over a few files which #include the
same .h file twice -- sometimes even in the immediately
following line. so I thought I'd look into that to reduce
the amount of duplicate includes in the kernel ...
(...)
diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c

drivers/macintosh/therm_pm72.c line 109

Quoted 7 lines
drivers/macintosh/therm_pm72.c +0 -1
@@ -104,7 +104,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>

This one was already taken care of in a different patch:

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch

So please exclude this part from your patch so as to avoid collisions.

Thanks,

Signature · 1 line
Jean Delvare
#6 lore raw
Quoted 22 lines · Jean Delvare

Hi Herbert,

Quoted 9 lines

recently I stumbled over a few files which #include the
same .h file twice -- sometimes even in the immediately
following line. so I thought I'd look into that to reduce
the amount of duplicate includes in the kernel ...
(...)
diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c

drivers/macintosh/therm_pm72.c line 109

Quoted 7 lines
drivers/macintosh/therm_pm72.c +0 -1
@@ -104,7 +104,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>

This one was already taken care of in a different patch:

Quoted 4 lines

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch

So please exclude this part from your patch so as to avoid collisions.

Is OK. I'll stage the big cleanup patches like this after everyone else's patches, so all that is left in this patch is stuff which doesn't intersect with anyone else's work.

That's one of the advantages of having everyone's development trees all in one place. (And people who run development trees which aren't in -mm lose).

#7 lore raw
Quoted 28 lines · Andrew Morton
Quoted 22 lines · Jean Delvare

Hi Herbert,

Quoted 9 lines

recently I stumbled over a few files which #include the
same .h file twice -- sometimes even in the immediately
following line. so I thought I'd look into that to reduce
the amount of duplicate includes in the kernel ...
(...)
diff -NurpP --minimal linux-2.6.16-rc2/drivers/macintosh/therm_pm72.c linux-2.6.16-rc2-mpf/drivers/macintosh/therm_pm72.c

drivers/macintosh/therm_pm72.c line 109

Quoted 7 lines
drivers/macintosh/therm_pm72.c +0 -1
@@ -104,7 +104,6 @@
 #include <linux/kernel.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/i2c.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/spinlock.h>

This one was already taken care of in a different patch:

Quoted 4 lines

http://www.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.16-rc3/2.6.16-rc3-mm1/broken-out/macintosh-cleanup-the-use-of-i2c-headers.patch

So please exclude this part from your patch so as to avoid collisions.

Quoted 7 lines

Is OK. I'll stage the big cleanup patches like this after everyone else's patches, so all that is left in this patch is stuff which doesn't intersect with anyone else's work.

That's one of the advantages of having everyone's development trees all in one place. (And people who run development trees which aren't in -mm lose).

okay, after Arthurs input regarding the script, I'll investigate this a little more and come up with a more detailed list of duplicate includes, maybe categorized by type of duplicate inclusion direct/indirect and by subsystem/architecture if that is desired?

any input here would be appreciated, even if it just is something like: "hey, we do not want this kind of cleanup done in the kernel" ...

best,
Herbert

#8 lore raw
In reply to Herbert Poetzl
Quoted 37 lines · Herbert Poetzl

diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop321-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop321-setup.c

arch/arm/mach-iop3xx/iop321-setup.c +0 -1
@@ -13,7 +13,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/platform_device.h>

diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/mach-iop3xx/iop331-setup.c linux-2.6.16-rc2-mpf/arch/arm/mach-iop3xx/iop331-setup.c

arch/arm/mach-iop3xx/iop331-setup.c +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/platform_device.h>

diff -NurpP --minimal linux-2.6.16-rc2/arch/arm/plat-omap/pm.c linux-2.6.16-rc2-mpf/arch/arm/plat-omap/pm.c

arch/arm/plat-omap/pm.c +0 -1
@@ -38,7 +38,6 @@
 #include <linux/pm.h>
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
-#include <linux/pm.h>
 #include <linux/interrupt.h>
 
 #include <asm/io.h>

diff -NurpP --minimal linux-2.6.16-rc2/drivers/video/s3c2410fb.c linux-2.6.16-rc2-mpf/drivers/video/s3c2410fb.c

drivers/video/s3c2410fb.c line 87

Quoted 7 lines
drivers/video/s3c2410fb.c +0 -1
@@ -82,7 +82,6 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/dma-mapping.h>
-#include <linux/string.h>
 #include <linux/interrupt.h>
 #include <linux/workqueue.h>
 #include <linux/wait.h>

Thanks, I've applied just the above bits of the patch.

Signature · 3 lines
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:  2.6 Serial core