added reenter check to lock_dequeue() to avoid unlocking of interrupts

via cause_sig() during an exception.

moved lock check configuration to <minix/sys_config.h> instead of
kernel/config.h, because the 'relocking' field in kinfo depends on it.

other prettification: common locking macro, whether lock timing is on or
not.

kernel/config.h

@@ -76,7 +76,6 @@
  * For normal operation all options should be disabled.
  */
 #define DEBUG_SCHED_CHECK  0	/* sanity check of scheduling queues */
-#define DEBUG_LOCK_CHECK   0	/* kernel lock() sanity check */
 #define DEBUG_TIME_LOCKS   0	/* measure time spent in locks */
 
 #endif /* CONFIG_H */

kernel/const.h

@@ -58,11 +58,19 @@
 #define IF_MASK 0x00000200
 #define IOPL_MASK 0x003000
 
+#if DEBUG_LOCK_CHECK
+#define reallock(c, v)	{ if (!(read_cpu_flags() & X86_FLAG_I)) { kinfo.relocking++; } else { intr_disable(); } }
+#else
+#define reallock(c, v)	intr_disable()
+#endif
+
+#define realunlock(c)	intr_enable()
+
 /* Disable/ enable hardware interrupts. The parameters of lock() and unlock()
  * are used when debugging is enabled. See debug.h for more information.
  */
-#define lock(c, v)	intr_disable(); 
-#define unlock(c)	intr_enable(); 
+#define lock(c, v)	reallock(c, v)
+#define unlock(c)	realunlock(c) 
 
 /* Sizes of memory tables. The boot monitor distinguishes three memory areas, 
  * namely low mem below 1M, 1M-16M, and mem after 16M. More chunks are needed

kernel/debug.h

@@ -51,15 +51,6 @@ _PROTOTYPE( void timer_end, (int cat) );
 #define locktimeend(c)
 #endif /* DEBUG_TIME_LOCKS */
 
-/* The locking checks counts relocking situation, which are dangerous because
- * the inner lock may unlock the outer one.
- */
-#if DEBUG_LOCK_CHECK
-#define lockcheck if (!(read_cpu_flags() & X86_FLAG_I)) kinfo.relocking++;
-#else
-#define lockcheck
-#endif /* DEBUG_LOCK_CHECK */
-
 /* This check makes sure that the scheduling queues are in a consistent state.
  * The check is run when the queues are updated with ready() and unready().
  */ 
@@ -73,14 +64,9 @@ _PROTOTYPE( void check_runqueues, (char *when) );
  */
 #if (DEBUG_TIME_LOCKS || DEBUG_LOCK_CHECK)
 #  undef lock
-#  define lock(c, v)	do { lockcheck; \
-	intr_disable(); \
-	locktimestart(c, v); \
-	} while(0)
+#  define lock(c, v)	do { reallock(c, v); locktimestart(c, v); } while(0)
 #  undef unlock
-#  define unlock(c)	do { locktimeend(c); \
-	intr_enable();\
-	 } while(0)
+#  define unlock(c)	do { locktimeend(c); realunlock(c); } while(0)
 #endif
 
 #endif /* DEBUG_H */

kernel/proc.c

@@ -669,8 +669,15 @@ PUBLIC void lock_dequeue(rp)
 struct proc *rp;		/* this process is no longer runnable */
 {
 /* Safe gateway to dequeue() for tasks. */
-  lock(4, "dequeue");
-  dequeue(rp);
-  unlock(4);
+  if (k_reenter >= 0) {
+	/* We're in an exception or interrupt, so don't lock (and.. 
+	 * don't unlock).
+	 */
+	dequeue(rp);
+  } else {
+	lock(4, "dequeue");
+	dequeue(rp);
+	unlock(4);
+  }
 }