summaryrefslogtreecommitdiff
path: root/spinlock.c
diff options
context:
space:
mode:
Diffstat (limited to 'spinlock.c')
-rw-r--r--spinlock.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/spinlock.c b/spinlock.c
index 5cbe062..2d64044 100644
--- a/spinlock.c
+++ b/spinlock.c
@@ -1,6 +1,7 @@
#include "types.h"
#include "defs.h"
#include "x86.h"
+#include "mmu.h"
#define LOCK_FREE -1
@@ -15,7 +16,7 @@ acquire_spinlock(uint32_t* lock)
if (*lock == cpu_id)
return;
- lapic_disableintr();
+ write_eflags(read_eflags() & ~FL_IF);
while ( cmpxchg(LOCK_FREE, cpu_id, lock) != cpu_id ) { ; }
// cprintf ("acquired: %d\n", cpu_id);
}
@@ -28,7 +29,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();
+ write_eflags(read_eflags() | FL_IF);
}
void