summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorrsc <rsc>2007-09-27 20:09:40 +0000
committerrsc <rsc>2007-09-27 20:09:40 +0000
commit3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff (patch)
tree3d0ee391126d390d1c5b72c8b1d003d0db6807aa /main.c
parent39c3fb1b157927058f24b72d43be6f15c1d422b7 (diff)
downloadxv6-labs-3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff.tar.gz
xv6-labs-3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff.tar.bz2
xv6-labs-3807c1f20b5f7dca7ec7ca4bbe38bc5904e980ff.zip
rename splhi/spllo to pushcli/popcli
Diffstat (limited to 'main.c')
-rw-r--r--main.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/main.c b/main.c
index 4176e6c..464112b 100644
--- a/main.c
+++ b/main.c
@@ -18,9 +18,9 @@ main(void)
// clear BSS
memset(edata, 0, end - edata);
- // splhi() every processor during bootstrap.
+ // pushcli() every processor during bootstrap.
for(i=0; i<NCPU; i++)
- cpus[i].nsplhi = 1; // no interrupts during bootstrap
+ cpus[i].ncli = 1; // no interrupts during bootstrap
mp_init(); // collect info about this machine
bcpu = mp_bcpu();
@@ -63,7 +63,7 @@ mpmain(void)
asm volatile("movl %0, %%ss" :: "r" (SEG_CPUSTACK << 3));
cpuid(0, 0, 0, 0, 0); // memory barrier
cpus[cpu()].booted = 1;
- spllo();
+ popcli();
scheduler();
}