From: Russell King <rmk+lkml@arm.linux.org.uk> This patch cleans up needless includes of asm/pgalloc.h from the fs/ kernel/ and mm/ subtrees. Compile tested on multiple ARM platforms, and x86, this patch appears safe. This patch is part of a larger patch aiming towards getting the include of asm/pgtable.h out of linux/mm.h, so that asm/pgtable.h can sanely get at things like mm_struct and friends. I suggest testing in -mm for a while to ensure there aren't any hidden arch issues. --- 25-akpm/fs/binfmt_aout.c | 1 - 25-akpm/fs/binfmt_elf.c | 1 - 25-akpm/fs/binfmt_flat.c | 1 - 25-akpm/fs/exec.c | 1 - 25-akpm/fs/proc/proc_misc.c | 1 - 25-akpm/include/asm-arm26/tlb.h | 1 + 25-akpm/include/asm-generic/tlb.h | 1 + 25-akpm/kernel/module.c | 1 - 25-akpm/mm/highmem.c | 1 - 25-akpm/mm/mincore.c | 1 - 25-akpm/mm/mmap.c | 1 - 25-akpm/mm/mprotect.c | 1 - 25-akpm/mm/mremap.c | 1 - 25-akpm/mm/msync.c | 1 - 25-akpm/mm/nommu.c | 1 - 25-akpm/mm/vmalloc.c | 1 - 25-akpm/mm/vmscan.c | 1 - 17 files changed, 2 insertions(+), 15 deletions(-) diff -puN fs/binfmt_aout.c~clean-up-asm-pgalloch-include fs/binfmt_aout.c --- 25/fs/binfmt_aout.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.369222552 -0700 +++ 25-akpm/fs/binfmt_aout.c 2004-04-18 15:23:38.393218904 -0700 @@ -27,7 +27,6 @@ #include <asm/system.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/cacheflush.h> static int load_aout_binary(struct linux_binprm *, struct pt_regs * regs); diff -puN fs/binfmt_elf.c~clean-up-asm-pgalloch-include fs/binfmt_elf.c --- 25/fs/binfmt_elf.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.370222400 -0700 +++ 25-akpm/fs/binfmt_elf.c 2004-04-18 15:23:38.394218752 -0700 @@ -40,7 +40,6 @@ #include <asm/uaccess.h> #include <asm/param.h> -#include <asm/pgalloc.h> #include <linux/elf.h> diff -puN fs/binfmt_flat.c~clean-up-asm-pgalloch-include fs/binfmt_flat.c --- 25/fs/binfmt_flat.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.372222096 -0700 +++ 25-akpm/fs/binfmt_flat.c 2004-04-18 15:23:38.395218600 -0700 @@ -40,7 +40,6 @@ #include <asm/byteorder.h> #include <asm/system.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/unaligned.h> #include <asm/cacheflush.h> diff -puN fs/exec.c~clean-up-asm-pgalloch-include fs/exec.c --- 25/fs/exec.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.373221944 -0700 +++ 25-akpm/fs/exec.c 2004-04-18 15:23:38.396218448 -0700 @@ -48,7 +48,6 @@ #include <linux/rmap.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/mmu_context.h> #ifdef CONFIG_KMOD diff -puN fs/proc/proc_misc.c~clean-up-asm-pgalloch-include fs/proc/proc_misc.c --- 25/fs/proc/proc_misc.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.375221640 -0700 +++ 25-akpm/fs/proc/proc_misc.c 2004-04-18 15:23:38.397218296 -0700 @@ -47,7 +47,6 @@ #include <asm/uaccess.h> #include <asm/pgtable.h> #include <asm/io.h> -#include <asm/pgalloc.h> #include <asm/tlb.h> #include <asm/div64.h> diff -puN include/asm-arm26/tlb.h~clean-up-asm-pgalloch-include include/asm-arm26/tlb.h --- 25/include/asm-arm26/tlb.h~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.376221488 -0700 +++ 25-akpm/include/asm-arm26/tlb.h 2004-04-18 15:23:38.397218296 -0700 @@ -1,6 +1,7 @@ #ifndef __ASMARM_TLB_H #define __ASMARM_TLB_H +#include <asm/pgalloc.h> #include <asm/tlbflush.h> /* diff -puN include/asm-generic/tlb.h~clean-up-asm-pgalloch-include include/asm-generic/tlb.h --- 25/include/asm-generic/tlb.h~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.377221336 -0700 +++ 25-akpm/include/asm-generic/tlb.h 2004-04-18 15:23:38.397218296 -0700 @@ -15,6 +15,7 @@ #include <linux/config.h> #include <linux/swap.h> +#include <asm/pgalloc.h> #include <asm/tlbflush.h> /* diff -puN kernel/module.c~clean-up-asm-pgalloch-include kernel/module.c --- 25/kernel/module.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.379221032 -0700 +++ 25-akpm/kernel/module.c 2004-04-18 15:23:38.398218144 -0700 @@ -36,7 +36,6 @@ #include <linux/stop_machine.h> #include <asm/uaccess.h> #include <asm/semaphore.h> -#include <asm/pgalloc.h> #include <asm/cacheflush.h> #if 0 diff -puN mm/highmem.c~clean-up-asm-pgalloch-include mm/highmem.c --- 25/mm/highmem.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.380220880 -0700 +++ 25-akpm/mm/highmem.c 2004-04-18 15:23:38.399217992 -0700 @@ -26,7 +26,6 @@ #include <linux/init.h> #include <linux/hash.h> #include <linux/highmem.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h> static mempool_t *page_pool, *isa_page_pool; diff -puN mm/mincore.c~clean-up-asm-pgalloch-include mm/mincore.c --- 25/mm/mincore.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.381220728 -0700 +++ 25-akpm/mm/mincore.c 2004-04-18 15:23:38.399217992 -0700 @@ -14,7 +14,6 @@ #include <asm/uaccess.h> #include <asm/pgtable.h> -#include <asm/pgalloc.h> /* * Later we can get more picky about what "in core" means precisely. diff -puN mm/mmap.c~clean-up-asm-pgalloch-include mm/mmap.c --- 25/mm/mmap.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.382220576 -0700 +++ 25-akpm/mm/mmap.c 2004-04-18 15:23:38.400217840 -0700 @@ -23,7 +23,6 @@ #include <linux/mount.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/tlb.h> /* diff -puN mm/mprotect.c~clean-up-asm-pgalloch-include mm/mprotect.c --- 25/mm/mprotect.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.384220272 -0700 +++ 25-akpm/mm/mprotect.c 2004-04-18 15:23:38.401217688 -0700 @@ -18,7 +18,6 @@ #include <linux/security.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/pgtable.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> diff -puN mm/mremap.c~clean-up-asm-pgalloch-include mm/mremap.c --- 25/mm/mremap.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.385220120 -0700 +++ 25-akpm/mm/mremap.c 2004-04-18 15:23:38.401217688 -0700 @@ -19,7 +19,6 @@ #include <linux/security.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> diff -puN mm/msync.c~clean-up-asm-pgalloch-include mm/msync.c --- 25/mm/msync.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.386219968 -0700 +++ 25-akpm/mm/msync.c 2004-04-18 15:23:38.402217536 -0700 @@ -13,7 +13,6 @@ #include <linux/mman.h> #include <asm/pgtable.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h> /* diff -puN mm/nommu.c~clean-up-asm-pgalloch-include mm/nommu.c --- 25/mm/nommu.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.387219816 -0700 +++ 25-akpm/mm/nommu.c 2004-04-18 15:23:38.402217536 -0700 @@ -19,7 +19,6 @@ #include <linux/vmalloc.h> #include <linux/blkdev.h> -#include <asm/pgalloc.h> #include <asm/uaccess.h> #include <asm/tlb.h> #include <asm/tlbflush.h> diff -puN mm/vmalloc.c~clean-up-asm-pgalloch-include mm/vmalloc.c --- 25/mm/vmalloc.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.389219512 -0700 +++ 25-akpm/mm/vmalloc.c 2004-04-18 15:23:38.403217384 -0700 @@ -17,7 +17,6 @@ #include <linux/vmalloc.h> #include <asm/uaccess.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h> diff -puN mm/vmscan.c~clean-up-asm-pgalloch-include mm/vmscan.c --- 25/mm/vmscan.c~clean-up-asm-pgalloch-include 2004-04-18 15:23:38.390219360 -0700 +++ 25-akpm/mm/vmscan.c 2004-04-18 15:23:38.403217384 -0700 @@ -33,7 +33,6 @@ #include <linux/cpu.h> #include <linux/notifier.h> -#include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm/div64.h> _