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

i-pu · Aug 30, 2018 · 1d19081 · 1d19081
1 parent 2c73068
commit 1d19081
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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;
 }