2.6.24-git16

 kernel

diff --git a/kernel/relay.c b/kernel/relay.c
index 61134eb..d080b9d 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -37,37 +37,31 @@ static void relay_file_mmap_close(struct vm_area_struct *vma)
 }
 
 /*
- * nopage() vm_op implementation for relay file mapping.
+ * fault() vm_op implementation for relay file mapping.
  */
-static struct page *relay_buf_nopage(struct vm_area_struct *vma,
-                 unsigned long address,
-                 int *type)
+static int relay_buf_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
    struct page *page;
    struct rchan_buf *buf = vma->vm_private_data;
-   unsigned long offset = address - vma->vm_start;
+   pgoff_t pgoff = vmf->pgoff;
 
-   if (address > vma->vm_end)
-      return NOPAGE_SIGBUS; /* Disallow mremap */
    if (!buf)
-      return NOPAGE_OOM;
+      return VM_FAULT_OOM;
 
-   page = vmalloc_to_page(buf->start + offset);
+   page = vmalloc_to_page(buf->start + (pgoff << PAGE_SHIFT));
    if (!page)
-      return NOPAGE_OOM;
+      return VM_FAULT_SIGBUS;
    get_page(page);
+   vmf->page = page;
 
-   if (type)
-      *type = VM_FAULT_MINOR;
-
-   return page;
+   return 0;
 }
 
 /*
  * vm_ops for relay file mappings.
  */
 static struct vm_operations_struct relay_file_mmap_ops = {
-   .nopage = relay_buf_nopage,
+   .fault = relay_buf_fault,
    .close = relay_file_mmap_close,
 };
 
@@ -92,6 +86,7 @@ static int relay_mmap_buf(struct rchan_buf *buf, struct vm_area_struct *vma)
       return -EINVAL;
 
    vma->vm_ops = &relay_file_mmap_ops;
+   vma->vm_flags |= VM_DONTEXPAND;
    vma->vm_private_data = buf;
    buf->chan->cb->buf_mapped(buf, filp);