儲存庫 vbox 的更動 37295

時間撮記:

2011-6-1 下午02:20:54 (13 年 以前)

作者:

vboxsync

訊息:

Runtime/r0drv/linux: Use RTThreadPreemptDisable/Enable wrappers so callbacks don't assert/fail unexpectedly.

檔案:

• trunk/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c (修改) (5 筆差異)

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

@@ -204 +204 @@
     RTMPARGS Args;
 
+    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;
@@ -217 +218 @@
 #else /* older kernels */
 
-# ifdef preempt_disable
-    preempt_disable();
-# endif
+    RTThreadPreemptDisable(&PreemptState);
     rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
     local_irq_disable();
     rtmpLinuxWrapper(&Args);
     local_irq_enable();
-# ifdef preempt_enable
-    preempt_enable();
-# endif
+    RTThreadPreemptRestore(&PreemptState);
 #endif /* older kernels */
     Assert(rc == 0); NOREF(rc);
@@ -239 +236 @@
     RTMPARGS Args;
 
+    RTTHREADPREEMPTSTATE PreemptState = RTTHREADPREEMPTSTATE_INITIALIZER;
     Args.pfnWorker = pfnWorker;
     Args.pvUser1 = pvUser1;
@@ -245 +243 @@
     Args.cHits = 0;
 
-#ifdef preempt_disable
-    preempt_disable();
-#endif
+    RTThreadPreemptDisable(&PreemptState);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
     rc = smp_call_function(rtmpLinuxWrapper, &Args, 1 /* wait */);
@@ -253 +249 @@
     rc = smp_call_function(rtmpLinuxWrapper, &Args, 0 /* retry */, 1 /* wait */);
 #endif /* older kernels */
-#ifdef preempt_enable
-    preempt_enable();
-#endif
+    RTThreadPreemptRestore(&PreemptState);
 
     Assert(rc == 0); NOREF(rc);