Allow holding to be called with interrupts enabled (for Mark Morrissey).

diff --git a/spinlock.c b/spinlock.c
index 9120bf226f02b02a2889eefe62a8f6672337f20c..402018643d087e0c077871974df0e40bf8b2a2ac 100644 (file)
--- a/spinlock.c
+++ b/spinlock.c
@@ -89,7 +89,11 @@ getcallerpcs(void *v, uint pcs[])
 int
 holding(struct spinlock *lock)
 {
-  return lock->locked && lock->cpu == mycpu();
+  int r;
+  pushcli();
+  r = lock->locked && lock->cpu == mycpu();
+  popcli();
+  return r;
 }