summaryrefslogtreecommitdiff
path: root/spinlock.c
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2010-09-13 15:34:44 -0400
committerRobert Morris <[email protected]>2010-09-13 15:34:44 -0400
commitfaad047ab22cbe989c208bff5ecb42608ecb8d7b (patch)
treeb47cd8948dcbc5c86117982245b53f4e9c95dc30 /spinlock.c
parent124fe7e457c0dc9b671c7ffccb56004eb61da4f0 (diff)
downloadxv6-labs-faad047ab22cbe989c208bff5ecb42608ecb8d7b.tar.gz
xv6-labs-faad047ab22cbe989c208bff5ecb42608ecb8d7b.tar.bz2
xv6-labs-faad047ab22cbe989c208bff5ecb42608ecb8d7b.zip
change some comments, maybe more informative
delete most comments from bootother.S (since copy of bootasm.S) ksegment() -> seginit() move more stuff from main() to mainc()
Diffstat (limited to 'spinlock.c')
-rw-r--r--spinlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/spinlock.c b/spinlock.c
index 68cfbe9..281748a 100644
--- a/spinlock.c
+++ b/spinlock.c
@@ -23,7 +23,7 @@ initlock(struct spinlock *lk, char *name)
void
acquire(struct spinlock *lk)
{
- pushcli();
+ pushcli(); // disable interrupts to avoid deadlock.
if(holding(lk))
panic("acquire");