Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4e950f6f0189f65f8bf069cf2272649ef418f5e4

Authored by Alexey Dobriyan
Committed by Linus Torvalds
1 parent 673d5b43da
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 45 changed files with 81 additions and 33 deletions Side-by-side Diff

arch/alpha/kernel/smp.c
Diff comments   View file @ 4e950f6
... ... @@ -16,6 +16,7 @@
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>
arch/arm/kernel/setup.c
Diff comments   View file @ 4e950f6
... ... @@ -23,6 +23,7 @@
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>
arch/arm/kernel/smp.c
Diff comments   View file @ 4e950f6
... ... @@ -17,6 +17,7 @@
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>
arch/frv/kernel/sys_frv.c
Diff comments   View file @ 4e950f6
... ... @@ -13,6 +13,7 @@
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>
arch/i386/kernel/microcode.c
Diff comments   View file @ 4e950f6
... ... @@ -82,6 +82,7 @@
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>
arch/i386/kernel/sys_i386.c
Diff comments   View file @ 4e950f6
... ... @@ -9,6 +9,7 @@
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>
arch/i386/kernel/sysenter.c
Diff comments   View file @ 4e950f6
... ... @@ -16,6 +16,7 @@
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>
arch/ia64/kernel/init_task.c
Diff comments   View file @ 4e950f6
... ... @@ -8,6 +8,7 @@
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>
arch/m68k/kernel/process.c
Diff comments   View file @ 4e950f6
... ... @@ -15,6 +15,7 @@
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>
arch/m68k/kernel/sys_m68k.c
Diff comments   View file @ 4e950f6
... ... @@ -10,6 +10,7 @@
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>
arch/mips/kernel/smp.c
Diff comments   View file @ 4e950f6
... ... @@ -30,6 +30,7 @@
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>
arch/mips/kernel/syscall.c
Diff comments   View file @ 4e950f6
... ... @@ -12,6 +12,7 @@
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>
arch/parisc/hpux/fs.c
Diff comments   View file @ 4e950f6
... ... @@ -23,6 +23,7 @@
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>
arch/parisc/kernel/init_task.c
Diff comments   View file @ 4e950f6
... ... @@ -23,6 +23,7 @@
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>
arch/parisc/kernel/process.c
Diff comments   View file @ 4e950f6
... ... @@ -38,6 +38,7 @@
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>
arch/parisc/kernel/smp.c
Diff comments   View file @ 4e950f6
... ... @@ -28,6 +28,7 @@
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  
arch/powerpc/kernel/syscalls.c
Diff comments   View file @ 4e950f6
... ... @@ -23,6 +23,7 @@
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>
arch/powerpc/lib/rheap.c
Diff comments   View file @ 4e950f6
... ... @@ -16,6 +16,7 @@
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>
arch/powerpc/oprofile/cell/spu_task_sync.c
Diff comments   View file @ 4e950f6
... ... @@ -21,6 +21,7 @@
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>
arch/s390/kernel/init_task.c
Diff comments   View file @ 4e950f6
... ... @@ -7,6 +7,7 @@
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>
arch/s390/kernel/process.c
Diff comments   View file @ 4e950f6
... ... @@ -21,6 +21,7 @@
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>
arch/s390/kernel/smp.c
Diff comments   View file @ 4e950f6
... ... @@ -23,6 +23,7 @@
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>
arch/s390/kernel/sys_s390.c
Diff comments   View file @ 4e950f6
... ... @@ -16,6 +16,7 @@
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>
arch/sparc/kernel/init_task.c
Diff comments   View file @ 4e950f6
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>
arch/sparc64/kernel/init_task.c
Diff comments   View file @ 4e950f6
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>
arch/sparc64/kernel/process.c
Diff comments   View file @ 4e950f6
... ... @@ -18,6 +18,7 @@
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>
arch/um/drivers/mmapper_kern.c
Diff comments   View file @ 4e950f6
... ... @@ -12,6 +12,7 @@
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"
arch/um/kernel/exec.c
Diff comments   View file @ 4e950f6
... ... @@ -6,6 +6,7 @@
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"
arch/um/kernel/init_task.c
Diff comments   View file @ 4e950f6
... ... @@ -4,6 +4,7 @@
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"
arch/um/kernel/syscall.c
Diff comments   View file @ 4e950f6
... ... @@ -7,6 +7,7 @@
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"
arch/x86_64/ia32/ptrace32.c
Diff comments   View file @ 4e950f6
... ... @@ -15,6 +15,7 @@
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>
arch/x86_64/kernel/process.c
Diff comments   View file @ 4e950f6
... ... @@ -23,6 +23,7 @@
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>
arch/x86_64/kernel/sys_x86_64.c
Diff comments   View file @ 4e950f6
... ... @@ -6,6 +6,7 @@
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>
arch/x86_64/vdso/vma.c
Diff comments   View file @ 4e950f6
... ... @@ -4,6 +4,7 @@
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>
drivers/char/agp/compat_ioctl.c
Diff comments   View file @ 4e950f6
... ... @@ -28,6 +28,7 @@
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"
drivers/char/agp/frontend.c
Diff comments   View file @ 4e950f6
... ... @@ -37,6 +37,7 @@
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>
drivers/char/mmtimer.c
Diff comments   View file @ 4e950f6
... ... @@ -25,6 +25,7 @@
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>
drivers/char/mspec.c
Diff comments   View file @ 4e950f6
... ... @@ -38,6 +38,7 @@
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>
drivers/infiniband/hw/ipath/ipath_diag.c
Diff comments   View file @ 4e950f6
... ... @@ -44,6 +44,7 @@
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"
... ... @@ -20,6 +20,7 @@
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>
include/linux/hugetlb.h
Diff comments   View file @ 4e950f6
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>
... ... @@ -10,7 +10,6 @@
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 16  
... ... @@ -18,7 +17,9 @@
18 17  
19 18 struct mempolicy;
20 19 struct anon_vma;
  20 +struct file_ra_state;
21 21 struct user_struct;
  22 +struct writeback_control;
22 23  
23 24 #ifndef CONFIG_DISCONTIGMEM /* Don't use mapnrs, do it properly */
24 25 extern unsigned long max_mapnr;
... ... @@ -861,38 +862,7 @@
861 862 extern void register_shrinker(struct shrinker *);
862 863 extern void unregister_shrinker(struct shrinker *);
863 864  
864   -/*
865   - * Some shared mappigns will want the pages marked read-only
866   - * to track write events. If so, we'll downgrade vm_page_prot
867   - * to the private version (using protection_map[] without the
868   - * VM_SHARED bit).
869   - */
870   -static inline int vma_wants_writenotify(struct vm_area_struct *vma)
871   -{
872   - unsigned int vm_flags = vma->vm_flags;
873   -
874   - /* If it was private or non-writable, the write bit is already clear */
875   - if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
876   - return 0;
877   -
878   - /* The backer wishes to know when pages are first written to? */
879   - if (vma->vm_ops && vma->vm_ops->page_mkwrite)
880   - return 1;
881   -
882   - /* The open routine did something to the protections already? */
883   - if (pgprot_val(vma->vm_page_prot) !=
884   - pgprot_val(protection_map[vm_flags &
885   - (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]))
886   - return 0;
887   -
888   - /* Specialty mapping? */
889   - if (vm_flags & (VM_PFNMAP|VM_INSERTPAGE))
890   - return 0;
891   -
892   - /* Can the mapping track the dirty pages? */
893   - return vma->vm_file && vma->vm_file->f_mapping &&
894   - mapping_cap_account_dirty(vma->vm_file->f_mapping);
895   -}
  865 +int vma_wants_writenotify(struct vm_area_struct *vma);
896 866  
897 867 extern pte_t *FASTCALL(get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl));
898 868  
... ... @@ -1029,6 +1029,40 @@
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,
... ... @@ -17,6 +17,7 @@
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>
... ... @@ -10,6 +10,7 @@
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>