Changeset 44579 in vbox for trunk

Timestamp:

Feb 7, 2013 11:03:25 AM (12 years ago)

Author:

vboxsync

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

83654

Message:

BUGZ:6602 Reverted r83596.

Location:

trunk/src/VBox

Files:

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

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

@@ -271 +271 @@
 endif
 
-# Uncomment this in order to avoid spinlock checker
-# disabling when CONFIG_PROVE_LOCKING is enabled
-#KFLAGS += -DDO_NOT_DISABLE_PROVE_LOCKING
-
 # 2.6 and later
 MODULE_EXT    := ko

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

@@ -95 +95 @@
 #endif
 
-#if defined(CONFIG_PROVE_LOCKING) && defined(DO_NOT_DISABLE_PROVE_LOCKING)
-    /*
-      PLEASE DO NOT MODIFY THE NEXT FOUR LINES OF CODE!
-      We use this approach in order to split RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE and
-      RTSPINLOCK_FLAGS_INTERRUPT_SAFE spinlocks into separated locking classes when
-      CONFIG_PROVE_LOCKING kernel option is enabled. Using single spin_lock_init()
-      call will trigger kernel warning regarding to incorrect spinlock usage.
-    */
-    if (fFlags == RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE)
-        spin_lock_init(&pThis->Spinlock);
-    else
-        spin_lock_init(&pThis->Spinlock);
-#else
     spin_lock_init(&pThis->Spinlock);
-#endif
 
     *pSpinlock = pThis;
@@ -145 +131 @@
               ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0));
 
-#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
     lockdep_off();
 #endif
@@ -156 +142 @@
     else
         spin_lock(&pThis->Spinlock);
-#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
     lockdep_on();
 #endif
@@ -173 +159 @@
     RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis);
 
-#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
     lockdep_off();
 #endif
@@ -184 +170 @@
     else
         spin_unlock(&pThis->Spinlock);
-#if defined(CONFIG_PROVE_LOCKING) && !defined(DO_NOT_DISABLE_PROVE_LOCKING)
+#if defined(CONFIG_PROVE_LOCKING) && !defined(RT_STRICT)
     lockdep_on();
 #endif