Changeset 67665 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Jun 28, 2017 3:10:11 PM (8 years ago)

Author:

vboxsync

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

116471

Message:

Runtime/r0drv/linux: adapted to CONFIG_CPUMASK_OFFSTACK=y

File:

• trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c

@@ -385 +385 @@
          * call wait ourselves.
          */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+        /* 2.6.28 introduces CONFIG_CPUMASK_OFFSTACK */
+        cpumask_var_t DstCpuMask;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
         cpumask_t   DstCpuMask;
 #endif
@@ -398 +401 @@
         Args.cHits   = 0;
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-        cpumask_clear(&DstCpuMask);
-        cpumask_set_cpu(idCpu1, &DstCpuMask);
-        cpumask_set_cpu(idCpu2, &DstCpuMask);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)
+        if (!zalloc_cpumask_var(&DstCpuMask, GFP_KERNEL))
+            return VERR_NO_MEMORY;
+        cpumask_set_cpu(idCpu1, DstCpuMask);
+        cpumask_set_cpu(idCpu2, DstCpuMask);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+        if (!alloc_cpumask_var(&DstCpuMask, GFP_KERNEL))
+            return VERR_NO_MEMORY;
+        cpumask_clear(DstCpuMask);
+        cpumask_set_cpu(idCpu1, DstCpuMask);
+        cpumask_set_cpu(idCpu2, DstCpuMask);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
         cpus_clear(DstCpuMask);
@@ -409 +419 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
-        smp_call_function_many(&DstCpuMask, rtmpLinuxWrapperPostInc, &Args, !fCallSelf /* wait */);
+        smp_call_function_many(DstCpuMask, rtmpLinuxWrapperPostInc, &Args, !fCallSelf /* wait */);
         rc = 0;
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
@@ -441 +451 @@
         else
             rc = VERR_CPU_IPE_1;
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)
+        free_cpumask_var(DstCpuMask);
+#endif
     }
     /*