summaryrefslogtreecommitdiff
path: root/spinlock.h
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2011-08-29 17:18:40 -0400
committerFrans Kaashoek <[email protected]>2011-08-29 17:18:40 -0400
commit1ddfbbb194e3aa668b33469eb547132a7a7f940a (patch)
tree41ad0ae10ef2743c6e9433e711358dede77ce041 /spinlock.h
parent22f7db5336cb20c82eb1ffa45c0ef63825442c95 (diff)
downloadxv6-labs-1ddfbbb194e3aa668b33469eb547132a7a7f940a.tar.gz
xv6-labs-1ddfbbb194e3aa668b33469eb547132a7a7f940a.tar.bz2
xv6-labs-1ddfbbb194e3aa668b33469eb547132a7a7f940a.zip
Revert "Introduce and use sleeplocks instead of BUSY flags"
My changes have a race with re-used bufs and the code doesn't seem to get shorter Keep the changes that fixed ip->off race This reverts commit 3a5fa7ed9020eaf8ab843a16d26db7393b2ec072. Conflicts: defs.h file.c file.h
Diffstat (limited to 'spinlock.h')
-rw-r--r--spinlock.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/spinlock.h b/spinlock.h
index f6a69b7..fdda016 100644
--- a/spinlock.h
+++ b/spinlock.h
@@ -1,4 +1,4 @@
-// Mutual exclusion lock for short code fragments
+// Mutual exclusion lock.
struct spinlock {
uint locked; // Is the lock held?
@@ -9,8 +9,3 @@ struct spinlock {
// that locked the lock.
};
-// Lock that maybe held across sleeps
-struct sleeplock {
- uint locked; // Is the lock held?
-};
-