Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Remove fs.h from mm.h

Remove fs.h from mm.h. For this,
1) Uninline vma_wants_writenotify(). It's pretty huge anyway.
2) Add back fs.h or less bloated headers (err.h) to files that need it.

As result, on x86_64 allyesconfig, fs.h dependencies cut down from 3929 files
rebuilt down to 3444 (-12.3%).

Cross-compile tested without regressions on my two usual configs and (sigh):

alpha arm-mx1ads mips-bigsur powerpc-ebony
alpha-allnoconfig arm-neponset mips-capcella powerpc-g5
alpha-defconfig arm-netwinder mips-cobalt powerpc-holly
alpha-up arm-netx mips-db1000 powerpc-iseries
arm arm-ns9xxx mips-db1100 powerpc-linkstation
arm-assabet arm-omap_h2_1610 mips-db1200 powerpc-lite5200
arm-at91rm9200dk arm-onearm mips-db1500 powerpc-maple
arm-at91rm9200ek arm-picotux200 mips-db1550 powerpc-mpc7448_hpc2
arm-at91sam9260ek arm-pleb mips-ddb5477 powerpc-mpc8272_ads
arm-at91sam9261ek arm-pnx4008 mips-decstation powerpc-mpc8313_rdb
arm-at91sam9263ek arm-pxa255-idp mips-e55 powerpc-mpc832x_mds
arm-at91sam9rlek arm-realview mips-emma2rh powerpc-mpc832x_rdb
arm-ateb9200 arm-realview-smp mips-excite powerpc-mpc834x_itx
arm-badge4 arm-rpc mips-fulong powerpc-mpc834x_itxgp
arm-carmeva arm-s3c2410 mips-ip22 powerpc-mpc834x_mds
arm-cerfcube arm-shannon mips-ip27 powerpc-mpc836x_mds
arm-clps7500 arm-shark mips-ip32 powerpc-mpc8540_ads
arm-collie arm-simpad mips-jazz powerpc-mpc8544_ds
arm-corgi arm-spitz mips-jmr3927 powerpc-mpc8560_ads
arm-csb337 arm-trizeps4 mips-malta powerpc-mpc8568mds
arm-csb637 arm-versatile mips-mipssim powerpc-mpc85xx_cds
arm-ebsa110 i386 mips-mpc30x powerpc-mpc8641_hpcn
arm-edb7211 i386-allnoconfig mips-msp71xx powerpc-mpc866_ads
arm-em_x270 i386-defconfig mips-ocelot powerpc-mpc885_ads
arm-ep93xx i386-up mips-pb1100 powerpc-pasemi
arm-footbridge ia64 mips-pb1500 powerpc-pmac32
arm-fortunet ia64-allnoconfig mips-pb1550 powerpc-ppc64
arm-h3600 ia64-bigsur mips-pnx8550-jbs powerpc-prpmc2800
arm-h7201 ia64-defconfig mips-pnx8550-stb810 powerpc-ps3
arm-h7202 ia64-gensparse mips-qemu powerpc-pseries
arm-hackkit ia64-sim mips-rbhma4200 powerpc-up
arm-integrator ia64-sn2 mips-rbhma4500 s390
arm-iop13xx ia64-tiger mips-rm200 s390-allnoconfig
arm-iop32x ia64-up mips-sb1250-swarm s390-defconfig
arm-iop33x ia64-zx1 mips-sead s390-up
arm-ixp2000 m68k mips-tb0219 sparc
arm-ixp23xx m68k-amiga mips-tb0226 sparc-allnoconfig
arm-ixp4xx m68k-apollo mips-tb0287 sparc-defconfig
arm-jornada720 m68k-atari mips-workpad sparc-up
arm-kafa m68k-bvme6000 mips-wrppmc sparc64
arm-kb9202 m68k-hp300 mips-yosemite sparc64-allnoconfig
arm-ks8695 m68k-mac parisc sparc64-defconfig
arm-lart m68k-mvme147 parisc-allnoconfig sparc64-up
arm-lpd270 m68k-mvme16x parisc-defconfig um-x86_64
arm-lpd7a400 m68k-q40 parisc-up x86_64
arm-lpd7a404 m68k-sun3 powerpc x86_64-allnoconfig
arm-lubbock m68k-sun3x powerpc-cell x86_64-defconfig
arm-lusl7200 mips powerpc-celleb x86_64-up
arm-mainstone mips-atlas powerpc-chrp32

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alexey Dobriyan and committed by
Linus Torvalds
4e950f6f 673d5b43

+81 -33
+1
arch/alpha/kernel/smp.c
··· 16 16 #include <linux/module.h> 17 17 #include <linux/sched.h> 18 18 #include <linux/mm.h> 19 + #include <linux/err.h> 19 20 #include <linux/threads.h> 20 21 #include <linux/smp.h> 21 22 #include <linux/interrupt.h>
+1
arch/arm/kernel/setup.c
··· 23 23 #include <linux/cpu.h> 24 24 #include <linux/interrupt.h> 25 25 #include <linux/smp.h> 26 + #include <linux/fs.h> 26 27 27 28 #include <asm/cpu.h> 28 29 #include <asm/elf.h>
+1
arch/arm/kernel/smp.c
··· 17 17 #include <linux/profile.h> 18 18 #include <linux/errno.h> 19 19 #include <linux/mm.h> 20 + #include <linux/err.h> 20 21 #include <linux/cpu.h> 21 22 #include <linux/smp.h> 22 23 #include <linux/seq_file.h>
+1
arch/frv/kernel/sys_frv.c
··· 13 13 #include <linux/errno.h> 14 14 #include <linux/sched.h> 15 15 #include <linux/mm.h> 16 + #include <linux/fs.h> 16 17 #include <linux/smp.h> 17 18 #include <linux/sem.h> 18 19 #include <linux/msg.h>
+1
arch/i386/kernel/microcode.c
··· 82 82 #include <linux/miscdevice.h> 83 83 #include <linux/spinlock.h> 84 84 #include <linux/mm.h> 85 + #include <linux/fs.h> 85 86 #include <linux/mutex.h> 86 87 #include <linux/cpu.h> 87 88 #include <linux/firmware.h>
+1
arch/i386/kernel/sys_i386.c
··· 9 9 #include <linux/errno.h> 10 10 #include <linux/sched.h> 11 11 #include <linux/mm.h> 12 + #include <linux/fs.h> 12 13 #include <linux/smp.h> 13 14 #include <linux/sem.h> 14 15 #include <linux/msg.h>
+1
arch/i386/kernel/sysenter.c
··· 16 16 #include <linux/string.h> 17 17 #include <linux/elf.h> 18 18 #include <linux/mm.h> 19 + #include <linux/err.h> 19 20 #include <linux/module.h> 20 21 21 22 #include <asm/cpufeature.h>
+1
arch/ia64/kernel/init_task.c
··· 8 8 9 9 #include <linux/init.h> 10 10 #include <linux/mm.h> 11 + #include <linux/fs.h> 11 12 #include <linux/module.h> 12 13 #include <linux/sched.h> 13 14 #include <linux/init_task.h>
+1
arch/m68k/kernel/process.c
··· 15 15 #include <linux/sched.h> 16 16 #include <linux/kernel.h> 17 17 #include <linux/mm.h> 18 + #include <linux/fs.h> 18 19 #include <linux/smp.h> 19 20 #include <linux/smp_lock.h> 20 21 #include <linux/stddef.h>
+1
arch/m68k/kernel/sys_m68k.c
··· 10 10 #include <linux/errno.h> 11 11 #include <linux/sched.h> 12 12 #include <linux/mm.h> 13 + #include <linux/fs.h> 13 14 #include <linux/smp.h> 14 15 #include <linux/smp_lock.h> 15 16 #include <linux/sem.h>
+1
arch/mips/kernel/smp.c
··· 30 30 #include <linux/sched.h> 31 31 #include <linux/cpumask.h> 32 32 #include <linux/cpu.h> 33 + #include <linux/err.h> 33 34 34 35 #include <asm/atomic.h> 35 36 #include <asm/cpu.h>
+1
arch/mips/kernel/syscall.c
··· 12 12 #include <linux/errno.h> 13 13 #include <linux/linkage.h> 14 14 #include <linux/mm.h> 15 + #include <linux/fs.h> 15 16 #include <linux/smp.h> 16 17 #include <linux/mman.h> 17 18 #include <linux/ptrace.h>
+1
arch/parisc/hpux/fs.c
··· 23 23 24 24 #include <linux/kernel.h> 25 25 #include <linux/mm.h> 26 + #include <linux/fs.h> 26 27 #include <linux/sched.h> 27 28 #include <linux/file.h> 28 29 #include <linux/slab.h>
+1
arch/parisc/kernel/init_task.c
··· 23 23 */ 24 24 25 25 #include <linux/mm.h> 26 + #include <linux/fs.h> 26 27 #include <linux/module.h> 27 28 #include <linux/sched.h> 28 29 #include <linux/init.h>
+1
arch/parisc/kernel/process.c
··· 38 38 #include <linux/errno.h> 39 39 #include <linux/kernel.h> 40 40 #include <linux/mm.h> 41 + #include <linux/fs.h> 41 42 #include <linux/module.h> 42 43 #include <linux/personality.h> 43 44 #include <linux/ptrace.h>
+1
arch/parisc/kernel/smp.c
··· 28 28 #include <linux/smp.h> 29 29 #include <linux/kernel_stat.h> 30 30 #include <linux/mm.h> 31 + #include <linux/err.h> 31 32 #include <linux/delay.h> 32 33 #include <linux/bitops.h> 33 34
+1
arch/powerpc/kernel/syscalls.c
··· 23 23 #include <linux/sched.h> 24 24 #include <linux/syscalls.h> 25 25 #include <linux/mm.h> 26 + #include <linux/fs.h> 26 27 #include <linux/smp.h> 27 28 #include <linux/sem.h> 28 29 #include <linux/msg.h>
+1
arch/powerpc/lib/rheap.c
··· 16 16 #include <linux/errno.h> 17 17 #include <linux/kernel.h> 18 18 #include <linux/mm.h> 19 + #include <linux/err.h> 19 20 #include <linux/slab.h> 20 21 21 22 #include <asm/rheap.h>
+1
arch/powerpc/oprofile/cell/spu_task_sync.c
··· 21 21 #include <linux/dcookies.h> 22 22 #include <linux/kref.h> 23 23 #include <linux/mm.h> 24 + #include <linux/fs.h> 24 25 #include <linux/module.h> 25 26 #include <linux/notifier.h> 26 27 #include <linux/numa.h>
+1
arch/s390/kernel/init_task.c
··· 7 7 */ 8 8 9 9 #include <linux/mm.h> 10 + #include <linux/fs.h> 10 11 #include <linux/module.h> 11 12 #include <linux/sched.h> 12 13 #include <linux/init_task.h>
+1
arch/s390/kernel/process.c
··· 21 21 #include <linux/sched.h> 22 22 #include <linux/kernel.h> 23 23 #include <linux/mm.h> 24 + #include <linux/fs.h> 24 25 #include <linux/smp.h> 25 26 #include <linux/stddef.h> 26 27 #include <linux/unistd.h>
+1
arch/s390/kernel/smp.c
··· 23 23 #include <linux/module.h> 24 24 #include <linux/init.h> 25 25 #include <linux/mm.h> 26 + #include <linux/err.h> 26 27 #include <linux/spinlock.h> 27 28 #include <linux/kernel_stat.h> 28 29 #include <linux/delay.h>
+1
arch/s390/kernel/sys_s390.c
··· 16 16 #include <linux/errno.h> 17 17 #include <linux/sched.h> 18 18 #include <linux/mm.h> 19 + #include <linux/fs.h> 19 20 #include <linux/smp.h> 20 21 #include <linux/sem.h> 21 22 #include <linux/msg.h>
+1
arch/sparc/kernel/init_task.c
··· 1 1 #include <linux/mm.h> 2 + #include <linux/fs.h> 2 3 #include <linux/module.h> 3 4 #include <linux/sched.h> 4 5 #include <linux/init_task.h>
+1
arch/sparc64/kernel/init_task.c
··· 1 1 #include <linux/mm.h> 2 + #include <linux/fs.h> 2 3 #include <linux/module.h> 3 4 #include <linux/sched.h> 4 5 #include <linux/init_task.h>
+1
arch/sparc64/kernel/process.c
··· 18 18 #include <linux/kernel.h> 19 19 #include <linux/kallsyms.h> 20 20 #include <linux/mm.h> 21 + #include <linux/fs.h> 21 22 #include <linux/smp.h> 22 23 #include <linux/stddef.h> 23 24 #include <linux/ptrace.h>
+1
arch/um/drivers/mmapper_kern.c
··· 12 12 #include <linux/init.h> 13 13 #include <linux/module.h> 14 14 #include <linux/mm.h> 15 + #include <linux/fs.h> 15 16 #include <linux/miscdevice.h> 16 17 #include <asm/uaccess.h> 17 18 #include "mem_user.h"
+1
arch/um/kernel/exec.c
··· 6 6 #include "linux/slab.h" 7 7 #include "linux/smp_lock.h" 8 8 #include "linux/ptrace.h" 9 + #include "linux/fs.h" 9 10 #include "asm/ptrace.h" 10 11 #include "asm/pgtable.h" 11 12 #include "asm/tlbflush.h"
+1
arch/um/kernel/init_task.c
··· 4 4 */ 5 5 6 6 #include "linux/mm.h" 7 + #include "linux/fs.h" 7 8 #include "linux/module.h" 8 9 #include "linux/sched.h" 9 10 #include "linux/init_task.h"
+1
arch/um/kernel/syscall.c
··· 7 7 #include "linux/file.h" 8 8 #include "linux/smp_lock.h" 9 9 #include "linux/mm.h" 10 + #include "linux/fs.h" 10 11 #include "linux/utsname.h" 11 12 #include "linux/msg.h" 12 13 #include "linux/shm.h"
+1
arch/x86_64/ia32/ptrace32.c
··· 15 15 #include <linux/syscalls.h> 16 16 #include <linux/unistd.h> 17 17 #include <linux/mm.h> 18 + #include <linux/err.h> 18 19 #include <linux/ptrace.h> 19 20 #include <asm/ptrace.h> 20 21 #include <asm/compat.h>
+1
arch/x86_64/kernel/process.c
··· 23 23 #include <linux/sched.h> 24 24 #include <linux/kernel.h> 25 25 #include <linux/mm.h> 26 + #include <linux/fs.h> 26 27 #include <linux/elfcore.h> 27 28 #include <linux/smp.h> 28 29 #include <linux/slab.h>
+1
arch/x86_64/kernel/sys_x86_64.c
··· 6 6 #include <linux/sched.h> 7 7 #include <linux/syscalls.h> 8 8 #include <linux/mm.h> 9 + #include <linux/fs.h> 9 10 #include <linux/smp.h> 10 11 #include <linux/sem.h> 11 12 #include <linux/msg.h>
+1
arch/x86_64/vdso/vma.c
··· 4 4 * Subject to the GPL, v.2 5 5 */ 6 6 #include <linux/mm.h> 7 + #include <linux/err.h> 7 8 #include <linux/sched.h> 8 9 #include <linux/init.h> 9 10 #include <linux/random.h>
+1
drivers/char/agp/compat_ioctl.c
··· 28 28 29 29 #include <linux/kernel.h> 30 30 #include <linux/pci.h> 31 + #include <linux/fs.h> 31 32 #include <linux/agpgart.h> 32 33 #include <asm/uaccess.h> 33 34 #include "agp.h"
+1
drivers/char/agp/frontend.c
··· 37 37 #include <linux/agpgart.h> 38 38 #include <linux/slab.h> 39 39 #include <linux/mm.h> 40 + #include <linux/fs.h> 40 41 #include <linux/sched.h> 41 42 #include <asm/uaccess.h> 42 43 #include <asm/pgtable.h>
+1
drivers/char/mmtimer.c
··· 25 25 #include <linux/init.h> 26 26 #include <linux/errno.h> 27 27 #include <linux/mm.h> 28 + #include <linux/fs.h> 28 29 #include <linux/mmtimer.h> 29 30 #include <linux/miscdevice.h> 30 31 #include <linux/posix-timers.h>
+1
drivers/char/mspec.c
··· 38 38 #include <linux/miscdevice.h> 39 39 #include <linux/spinlock.h> 40 40 #include <linux/mm.h> 41 + #include <linux/fs.h> 41 42 #include <linux/vmalloc.h> 42 43 #include <linux/string.h> 43 44 #include <linux/slab.h>
+1
drivers/infiniband/hw/ipath/ipath_diag.c
··· 44 44 #include <linux/io.h> 45 45 #include <linux/pci.h> 46 46 #include <linux/vmalloc.h> 47 + #include <linux/fs.h> 47 48 #include <asm/uaccess.h> 48 49 49 50 #include "ipath_kernel.h"
+1
fs/dcookies.c
··· 20 20 #include <linux/capability.h> 21 21 #include <linux/dcache.h> 22 22 #include <linux/mm.h> 23 + #include <linux/err.h> 23 24 #include <linux/errno.h> 24 25 #include <linux/dcookies.h> 25 26 #include <linux/mutex.h>
+2
include/linux/hugetlb.h
··· 1 1 #ifndef _LINUX_HUGETLB_H 2 2 #define _LINUX_HUGETLB_H 3 3 4 + #include <linux/fs.h> 5 + 4 6 #ifdef CONFIG_HUGETLB_PAGE 5 7 6 8 #include <linux/mempolicy.h>
+3 -33
include/linux/mm.h
··· 10 10 #include <linux/mmzone.h> 11 11 #include <linux/rbtree.h> 12 12 #include <linux/prio_tree.h> 13 - #include <linux/fs.h> 14 13 #include <linux/mutex.h> 15 14 #include <linux/debug_locks.h> 16 15 #include <linux/backing-dev.h> ··· 17 18 18 19 struct mempolicy; 19 20 struct anon_vma; 21 + struct file_ra_state; 20 22 struct user_struct; 23 + struct writeback_control; 21 24 22 25 #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */ 23 26 extern unsigned long max_mapnr; ··· 862 861 extern void register_shrinker(struct shrinker *); 863 862 extern void unregister_shrinker(struct shrinker *); 864 863 865 - /* 866 - * Some shared mappigns will want the pages marked read-only 867 - * to track write events. If so, we'll downgrade vm_page_prot 868 - * to the private version (using protection_map[] without the 869 - * VM_SHARED bit). 870 - */ 871 - static inline int vma_wants_writenotify(struct vm_area_struct *vma) 872 - { 873 - unsigned int vm_flags = vma->vm_flags; 874 - 875 - /* If it was private or non-writable, the write bit is already clear */ 876 - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED))) 877 - return 0; 878 - 879 - /* The backer wishes to know when pages are first written to? */ 880 - if (vma->vm_ops && vma->vm_ops->page_mkwrite) 881 - return 1; 882 - 883 - /* The open routine did something to the protections already? */ 884 - if (pgprot_val(vma->vm_page_prot) != 885 - pgprot_val(protection_map[vm_flags & 886 - (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)])) 887 - return 0; 888 - 889 - /* Specialty mapping? */ 890 - if (vm_flags & (VM_PFNMAP|VM_INSERTPAGE)) 891 - return 0; 892 - 893 - /* Can the mapping track the dirty pages? */ 894 - return vma->vm_file && vma->vm_file->f_mapping && 895 - mapping_cap_account_dirty(vma->vm_file->f_mapping); 896 - } 864 + int vma_wants_writenotify(struct vm_area_struct *vma); 897 865 898 866 extern pte_t *FASTCALL(get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl)); 899 867
+34
mm/mmap.c
··· 1029 1029 } 1030 1030 EXPORT_SYMBOL(do_mmap_pgoff); 1031 1031 1032 + /* 1033 + * Some shared mappigns will want the pages marked read-only 1034 + * to track write events. If so, we'll downgrade vm_page_prot 1035 + * to the private version (using protection_map[] without the 1036 + * VM_SHARED bit). 1037 + */ 1038 + int vma_wants_writenotify(struct vm_area_struct *vma) 1039 + { 1040 + unsigned int vm_flags = vma->vm_flags; 1041 + 1042 + /* If it was private or non-writable, the write bit is already clear */ 1043 + if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED))) 1044 + return 0; 1045 + 1046 + /* The backer wishes to know when pages are first written to? */ 1047 + if (vma->vm_ops && vma->vm_ops->page_mkwrite) 1048 + return 1; 1049 + 1050 + /* The open routine did something to the protections already? */ 1051 + if (pgprot_val(vma->vm_page_prot) != 1052 + pgprot_val(protection_map[vm_flags & 1053 + (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)])) 1054 + return 0; 1055 + 1056 + /* Specialty mapping? */ 1057 + if (vm_flags & (VM_PFNMAP|VM_INSERTPAGE)) 1058 + return 0; 1059 + 1060 + /* Can the mapping track the dirty pages? */ 1061 + return vma->vm_file && vma->vm_file->f_mapping && 1062 + mapping_cap_account_dirty(vma->vm_file->f_mapping); 1063 + } 1064 + 1065 + 1032 1066 unsigned long mmap_region(struct file *file, unsigned long addr, 1033 1067 unsigned long len, unsigned long flags, 1034 1068 unsigned int vm_flags, unsigned long pgoff,
+1
mm/oom_kill.c
··· 17 17 18 18 #include <linux/oom.h> 19 19 #include <linux/mm.h> 20 + #include <linux/err.h> 20 21 #include <linux/sched.h> 21 22 #include <linux/swap.h> 22 23 #include <linux/timex.h>
+1
mm/vmstat.c
··· 10 10 */ 11 11 12 12 #include <linux/mm.h> 13 + #include <linux/err.h> 13 14 #include <linux/module.h> 14 15 #include <linux/cpu.h> 15 16 #include <linux/sched.h>