summaryrefslogtreecommitdiff
path: root/x86.h
diff options
context:
space:
mode:
authorrtm <rtm>2006-07-12 11:15:38 +0000
committerrtm <rtm>2006-07-12 11:15:38 +0000
commit8148b6ee535b85e97f3b5f3a850b70fdfbbcaf2d (patch)
treeea279d5ca141449bb8f363594c57d7e8fc142db0 /x86.h
parent664324745e2257289f7a61e43892ce6e8b8ed9b7 (diff)
downloadxv6-labs-8148b6ee535b85e97f3b5f3a850b70fdfbbcaf2d.tar.gz
xv6-labs-8148b6ee535b85e97f3b5f3a850b70fdfbbcaf2d.tar.bz2
xv6-labs-8148b6ee535b85e97f3b5f3a850b70fdfbbcaf2d.zip
i think my cmpxchg use was wrong in acquire
nesting cli/sti: release shouldn't always enable interrupts separate setup of lapic from starting of other cpus, so cpu() works earlier flag to disable locking in console output make locks work even when curproc==0 (still crashes in clock interrupt)
Diffstat (limited to 'x86.h')
-rw-r--r--x86.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/x86.h b/x86.h
index 80a4130..cc809e7 100644
--- a/x86.h
+++ b/x86.h
@@ -304,20 +304,6 @@ read_tsc(void)
return tsc;
}
-// disable interrupts
-static __inline void
-cli(void)
-{
- __asm __volatile("cli");
-}
-
-// enable interrupts
-static __inline void
-sti(void)
-{
- __asm __volatile("sti");
-}
-
struct PushRegs {
/* registers as pushed by pusha */
uint32_t reg_edi;