summaryrefslogtreecommitdiff
path: root/spinlock.c
diff options
context:
space:
mode:
authorkaashoek <kaashoek>2006-06-28 16:44:41 +0000
committerkaashoek <kaashoek>2006-06-28 16:44:41 +0000
commitf7cea12b38a86e9b37fa5bc635310d3f85e5f8db (patch)
tree3e4992596ecd73a1068b1a1284d1128692e903f1 /spinlock.c
parentbd303ed06096395778c80558e013b64bb47b9e9c (diff)
downloadxv6-labs-f7cea12b38a86e9b37fa5bc635310d3f85e5f8db.tar.gz
xv6-labs-f7cea12b38a86e9b37fa5bc635310d3f85e5f8db.tar.bz2
xv6-labs-f7cea12b38a86e9b37fa5bc635310d3f85e5f8db.zip
disable interrupts when holding kernel lock
Diffstat (limited to 'spinlock.c')
-rw-r--r--spinlock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/spinlock.c b/spinlock.c
index 911ecf8..5cbe062 100644
--- a/spinlock.c
+++ b/spinlock.c
@@ -14,6 +14,8 @@ acquire_spinlock(uint32_t* lock)
if (*lock == cpu_id)
return;
+
+ lapic_disableintr();
while ( cmpxchg(LOCK_FREE, cpu_id, lock) != cpu_id ) { ; }
// cprintf ("acquired: %d\n", cpu_id);
}
@@ -26,6 +28,7 @@ release_spinlock(uint32_t* lock)
if (*lock != cpu_id)
panic("release_spinlock: releasing a lock that i don't own\n");
*lock = LOCK_FREE;
+ lapic_enableintr();
}
void