Changeset 9494 in vbox

Timestamp:

Jun 6, 2008 4:31:33 PM (17 years ago)

Author:

vboxsync

Message:

fixed + re-enabled USE_NEW_OS_INTERFACE_FOR_GIP code for Linux

Location:

trunk/src/VBox

Files:

• HostDrivers/Support/linux/Makefile (modified) (1 diff)
• Runtime/r0drv/linux/timer-r0drv-linux.c (modified) (2 diffs)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -228 +228 @@
 # If this makes testboxes crash/burn/leak disable it and add a comment to defect #2116.
 #
-KFLAGS += -DUSE_NEW_OS_INTERFACE_FOR_MM 
-#-DUSE_NEW_OS_INTERFACE_FOR_GIP
+KFLAGS += -DUSE_NEW_OS_INTERFACE_FOR_MM -DUSE_NEW_OS_INTERFACE_FOR_GIP
 OBJS += r0drv/memobj-r0drv.o \
         r0drv/linux/memobj-r0drv-linux.o

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

@@ -188 +188 @@
 /**
  * Sets the state if it has a certain value.
+ *
+ * @return true if xchg was done.
+ * @return false if xchg wasn't done.
  */
 DECLINLINE(bool) rtTimerLnxCmpXchgState(RTTIMERLNXSTATE volatile *penmState, RTTIMERLNXSTATE enmNewState, RTTIMERLNXSTATE enmCurState)
@@ -539 +542 @@
                 break;
             Assert(enmState == RTTIMERLNXSTATE_ACTIVE);
-        } while (rtTimerLnxCmpXchgState(&pTimer->aSubTimers[iCpu].enmState, RTTIMERLNXSTATE_STOPPING, enmState));
+        } while (!rtTimerLnxCmpXchgState(&pTimer->aSubTimers[iCpu].enmState, RTTIMERLNXSTATE_STOPPING, enmState));
     }