From: Frans Kaashoek <kaashoek@mit.edu>
Date: Thu, 30 Aug 2018 20:14:34 +0000 (-0400)
Subject: Allow holding to be called with interrupts enabled (for Mark Morrissey).
X-Git-Url: https://git.devinivas.org/?a=commitdiff_plain;h=1d19081efbb9517d07c7e6c1a8393c6343ba7817;p=cs3210-lab1.git

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

diff --git a/spinlock.c b/spinlock.c
index 9120bf2..4020186 100644
--- 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;
 }