2 files changed, 2 insertions, 20 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 716568afdff8..cff63befeb9a 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -135,26 +135,8 @@ 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
+When:   Soon, 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.
diff --git a/Documentation/filesystems/Locking b/Documentation/filesystems/Locking
index 91ec4b40ebfe..f0f825808ca4 100644
--- a/Documentation/filesystems/Locking
+++ b/Documentation/filesystems/Locking
@@ -510,7 +510,7 @@ 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 *);
+        int (*fault)(struct vm_area_struct*, struct vm_fault *);
         struct page *(*nopage)(struct vm_area_struct*, unsigned long, int *);
         int (*page_mkwrite)(struct vm_area_struct *, struct page *);