Changeset 76939 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 22, 2019 4:51:28 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

128316

Message:

Reverted previous commit: merged too much.

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/vbox_fb.c (modified) (1 diff)
• drm/vbox_main.c (modified) (1 diff)
• sharedfolders/lnkops.c (modified) (2 diffs)
• sharedfolders/utils.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -344 +344 @@
                                sizes->fb_height);
 
-        info->screen_base = (char __iomem *)bo->kmap.virtual;
+        info->screen_base = bo->kmap.virtual;
         info->screen_size = size;
 

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -68 +68 @@
                         continue;
 
-                vbva = (void __force *)vbox->vbva_buffers + i * VBVA_MIN_BUFFER_SIZE;
+                vbva = (void *)vbox->vbva_buffers + i * VBVA_MIN_BUFFER_SIZE;
                 if (!VBoxVBVAEnable(&vbox->vbva_info[i],
                                  vbox->guest_pool, vbva, i)) {

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

@@ -36 +36 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *sf_follow_link(struct dentry *dentry, void **cookie)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+#  else
 static void *sf_follow_link(struct dentry *dentry, struct nameidata *nd)
-#else
-static int sf_follow_link(struct dentry *dentry, struct nameidata *nd)
 #  endif
 {
@@ -63 +61 @@
 #  else
         nd_set_link(nd, error ? ERR_PTR(error) : path);
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
         return NULL;
-# else
-        return 0;
-# endif
-#endif
+#  endif
 }
 
 #  if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void sf_put_link(struct dentry *dentry, struct nameidata *nd,
                         void *cookie)
-#else
-static void sf_put_link(struct dentry *dentry, struct nameidata *nd)
-#endif
 {
         char *page = nd_get_link(nd);

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

@@ -853 +853 @@
         /* Each new shared folder map gets a new uint64_t identifier,
          * allocated in sequence.  We ASSUME the sequence will not wrap. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
         static uint64_t s_u64Sequence = 0;
         uint64_t u64CurrentSequence = ASMAtomicIncU64(&s_u64Sequence);
-#endif
 
         sf_g->bdi.ra_pages = 0; /* No readahead */