Changeset 9179 in vbox for trunk/src/VBox

Timestamp:

May 27, 2008 8:15:41 PM (17 years ago)

Author:

vboxsync

Message:

make Linux guest kernel module compile with 2.6.26rc3

File:

• trunk/src/VBox/Additions/linux/sharedfolders/regops.c (modified) (3 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -315 +315 @@
 }
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+static int
+sf_reg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
 static struct page *
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
+sf_reg_nopage (struct vm_area_struct *vma, unsigned long vaddr, int *type)
+# define SET_TYPE(t) *type = (t)
+#else /* LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0) */
+static struct page *
 sf_reg_nopage (struct vm_area_struct *vma, unsigned long vaddr, int unused)
-#define SET_TYPE(t)
-#else
-sf_reg_nopage (struct vm_area_struct *vma, unsigned long vaddr, int *type)
-#define SET_TYPE(t) *type = (t)
+# define SET_TYPE(t)
 #endif
 {
@@ -335 +339 @@
 
         TRACE ();
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+        if (vmf->pgoff > vma->vm_end)
+                return VM_FAULT_SIGBUS;
+#else
         if (vaddr > vma->vm_end) {
                 SET_TYPE (VM_FAULT_SIGBUS);
                 return NOPAGE_SIGBUS;
         }
+#endif
 
         page = alloc_page (GFP_HIGHUSER);
         if (!page) {
                 LogRelFunc(("failed to allocate page\n"));
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+                return VM_FAULT_OOM;
+#else
                 SET_TYPE (VM_FAULT_OOM);
                 return NOPAGE_OOM;
+#endif
         }
 
         buf = kmap (page);
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+        off = (vmf->pgoff << PAGE_SHIFT);
+#else
         off = (vaddr - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
+#endif
         err = sf_reg_read_aux (__func__, sf_g, sf_r, buf, &nread, off);
         if (err) {
                 kunmap (page);
                 put_page (page);
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+                return VM_FAULT_SIGBUS;
+#else
                 SET_TYPE (VM_FAULT_SIGBUS);
                 return NOPAGE_SIGBUS;
+#endif
         }
 
         BUG_ON (nread > PAGE_SIZE);
         if (!nread) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 0)
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+                clear_user_page (page_address (page), vmf->pgoff, page);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)
+                clear_user_page (page_address (page), vaddr, page);
+#else
                 clear_user_page (page_address (page), vaddr);
-#else
-                clear_user_page (page_address (page), vaddr, page);
 #endif
         }
@@ -371 +394 @@
         flush_dcache_page (page);
         kunmap (page);
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+        vmf->page = page;
+        return 0;
+#else
         SET_TYPE (VM_FAULT_MAJOR);
         return page;
+#endif
 }
 
 static struct vm_operations_struct sf_vma_ops = {
+#if LINUX_VERSION_CODE > KERNEL_VERSION (2, 6, 25)
+        .fault = sf_reg_fault
+#else
         .nopage = sf_reg_nopage
+#endif
 };