From 679a977cb2d4df42ce1f144593716aeb855d7a92 Mon Sep 17 00:00:00 2001
From: rsc <rsc>
Date: Sun, 16 Jul 2006 15:38:13 +0000
Subject: [PATCH] remove acquire1 and release1

---
 defs.h     |  2 --
 spinlock.c | 20 ++++----------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/defs.h b/defs.h
index 0288a62..cb129a4 100644
--- a/defs.h
+++ b/defs.h
@@ -64,8 +64,6 @@ int cpu(void);
 struct spinlock;
 void acquire(struct spinlock * lock);
 void release(struct spinlock * lock);
-void acquire1(struct spinlock * lock, struct proc *);
-void release1(struct spinlock * lock, struct proc *);
 
 // main.c
 void load_icode(struct proc *p, uint8_t *binary, unsigned size);
diff --git a/spinlock.c b/spinlock.c
index aa11ad5..7ab0bbe 100644
--- a/spinlock.c
+++ b/spinlock.c
@@ -10,7 +10,7 @@
 // because cprintf uses them itself.
 #define cprintf dont_use_cprintf
 
-extern int use_console_lock;
+extern int bootstrap;
 
 int
 getcallerpc(void *v)
@@ -19,7 +19,7 @@ getcallerpc(void *v)
 }
 
 void
-acquire1(struct spinlock * lock, struct proc *cp)
+acquire(struct spinlock * lock)
 {
 	if(cpus[cpu()].nlock++ == 0)
 		cli();
@@ -30,23 +30,11 @@ acquire1(struct spinlock * lock, struct proc *cp)
 }
 
 void
-release1(struct spinlock * lock, struct proc *cp)
+release(struct spinlock * lock)
 {
 	cpuid(0, 0, 0, 0, 0);	// memory barrier
 	lock->locked = 0;
-	if(--cpus[cpu()].nlock == 0)
+	if(--cpus[cpu()].nlock == 0 && !bootstrap)
 		sti();
 }
 
-void
-acquire(struct spinlock *lock)
-{
-	acquire1(lock, curproc[cpu()]);
-}
-
-void
-release(struct spinlock *lock)
-{
-	release1(lock, curproc[cpu()]);
-}
-