1 files changed, 5 insertions, 4 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 242c3f66493a..e2d090348b1e 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -224,13 +224,13 @@ static void shm_close(struct vm_area_struct *vma)
         mutex_unlock(&shm_ids(ns).mutex);
 }
 
-static struct page *shm_nopage(struct vm_area_struct *vma,
-                               unsigned long address, int *type)
+static struct page *shm_fault(struct vm_area_struct *vma,
+                                        struct fault_data *fdata)
 {
         struct file *file = vma->vm_file;
         struct shm_file_data *sfd = shm_file_data(file);
 
-        return sfd->vm_ops->nopage(vma, address, type);
+        return sfd->vm_ops->fault(vma, fdata);
 }
 
 #ifdef CONFIG_NUMA
@@ -269,6 +269,7 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma)
         if (ret != 0)
                 return ret;
         sfd->vm_ops = vma->vm_ops;
+        BUG_ON(!sfd->vm_ops->fault);
         vma->vm_ops = &shm_vm_ops;
         shm_open(vma);
 
@@ -327,7 +328,7 @@ static const struct file_operations shm_file_operations = {
 static struct vm_operations_struct shm_vm_ops = {
         .open   = shm_open,     /* callback for a new vm-area open */
         .close  = shm_close,    /* callback for when the vm-area is released */
-        .nopage = shm_nopage,
+        .fault  = shm_fault,
 #if defined(CONFIG_NUMA)
         .set_policy = shm_set_policy,
         .get_policy = shm_get_policy,