2 files changed, 29 insertions, 0 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 66c8b4b165c1..716568afdff8 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -135,6 +135,33 @@ Who:	Greg Kroah-Hartman <gregkh@suse.de>
 
 ---------------------------
 
+What:   filemap_nopage, filemap_populate
+When:   April 2007
+Why:    These legacy interfaces no longer have any callers in the kernel and
+        any functionality provided can be provided with filemap_fault. The
+        removal schedule is short because they are a big maintainence burden
+        and have some bugs.
+Who:    Nick Piggin <npiggin@suse.de>
+
+---------------------------
+
+What:   vm_ops.populate, install_page
+When:   April 2007
+Why:    These legacy interfaces no longer have any callers in the kernel and
+        any functionality provided can be provided with vm_ops.fault.
+Who:    Nick Piggin <npiggin@suse.de>
+
+---------------------------
+
+What:   vm_ops.nopage
+When:   February 2008, provided in-kernel callers have been converted
+Why:    This interface is replaced by vm_ops.fault, but it has been around
+        forever, is used by a lot of drivers, and doesn't cost much to
+        maintain.
+Who:    Nick Piggin <npiggin@suse.de>
+
+---------------------------
+
 What:   Interrupt only SA_* flags
 When:   September 2007
 Why:    The interrupt related SA_* flags are replaced by IRQF_* to move them
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index d866551be037..970c8ec1a05b 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -510,12 +510,14 @@ More details about quota locking can be found in fs/dquot.c.
 prototypes:
         void (*open)(struct vm_area_struct*);
         void (*close)(struct vm_area_struct*);
+        struct page *(*fault)(struct vm_area_struct*, struct fault_data *);
         struct page *(*nopage)(struct vm_area_struct*, unsigned long, int *);
 
 locking rules:
                 BKL     mmap_sem
 open:           no      yes
 close:          no      yes
+fault:          no      yes
 nopage:         no      yes
 
 ================================================================================