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

Timestamp:

Sep 15, 2011 12:41:51 PM (13 years ago)

Author:

vboxsync

Message:

Linux Additions build fix (untested)

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c

@@ -61 +61 @@
 #endif
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+# define USE_WORKQUEUE
+#endif
+
+#ifdef USE_WORKQUEUE
 /* The definition of work queue functions changed in Linux 2.6.20. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
 typedef struct work_struct *WQ_PARAM;
-#else
+# else
 typedef void *WQ_PARAM;
+# endif
+#else
+typedef unsigned long WQ_PARAM;
 #endif
 
@@ -106 +114 @@
 /** Wait queue used by polling. */
 static wait_queue_head_t        g_PollEventQueue;
+#ifdef USE_WORKQUEUE
 /** The IRQ bottom half work queue for reporting the mouse position */
 static struct work_struct       g_MouseEventWQ;
+#else
+DECLARE_TASKLET_DISABLED(g_MouseTasklet, vboxguestReportMousePosition, 0);
+#endif
 /** Asynchronous notification stuff.  */
 static struct fasync_struct    *g_pFAsyncQueue;
@@ -363 +375 @@
 
     init_waitqueue_head(&g_PollEventQueue);
+#ifdef USE_WORKQUEUE
     INIT_WORK(&g_MouseEventWQ, vboxguestReportMousePosition
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
               , NULL
-#endif
+# endif
               );
+#else
+    tasklet_enable(&g_MouseTasklet);
+    tasklet_schedule(&g_MouseTasklet);
+#endif
     rc = request_irq(g_pPciDev->irq,
                      vboxguestLinuxISR,
@@ -985 +1002 @@
     kill_fasync(&g_pFAsyncQueue, SIGIO, POLL_IN);
     Log(("VBoxGuestNativeISRMousePollEvent: done\n"));
+#ifdef USE_WORKQUEUE
     schedule_work(&g_MouseEventWQ);
+#else
+    tasklet_schedule(&g_MouseTasklet);
+#endif
 }
 
@@ -1101 +1122 @@
 MODULE_VERSION(VBOX_VERSION_STRING);
 #endif
-