rename splhi/spllo to pushcli/popcli

1 files changed, 5 insertions, 5 deletions

diff --git a/proc.c b/proc.c
index b80a08e..e139c39 100644
--- a/proc.c
+++ b/proc.c
@@ -71,7 +71,7 @@ setupsegs(struct proc *p)
 {
   struct cpu *c;
   
-  splhi();
+  pushcli();
   c = &cpus[cpu()];
   c->ts.ss0 = SEG_PROCSTACK << 3;
   if(p)
@@ -97,7 +97,7 @@ setupsegs(struct proc *p)
 
   lgdt(c->gdt, sizeof(c->gdt));
   ltr(SEG_TSS << 3);
-  spllo();
+  popcli();
 }
 
 // Create a new process copying p as the parent.
@@ -189,9 +189,9 @@ curproc(void)
 {
   struct proc *p;
 
-  splhi();
+  pushcli();
   p = cpus[cpu()].curproc;
-  spllo();
+  popcli();
   return p;
 }
 
@@ -249,7 +249,7 @@ sched(void)
     panic("sched running");
   if(!holding(&proc_table_lock))
     panic("sched proc_table_lock");
-  if(cpus[cpu()].nsplhi != 1)
+  if(cpus[cpu()].ncli != 1)
     panic("sched locks");
 
   swtch(&cp->context, &cpus[cpu()].context);