switchkvm and switchuvm to switchvm

f1a6ce0e · Silas Boyd-Wickizer · 785c3855 · f1a6ce0e · f1a6ce0e · f1a6ce0e
--- a/include/kernel.hh
+++ b/include/kernel.hh
@@ -253,8 +253,7 @@ void            uartputc(char c);
 void            uartintr(void);

 // vm.c
-void            switchuvm(struct proc*);
-void            switchkvm(void);
+void            switchvm(struct proc*);
 int             pagefault(struct vmap *, uptr, u32);

 // wq.c

--- a/kernel/exec.cc
+++ b/kernel/exec.cc
@@ -213,7 +213,7 @@ exec(char *path, char **argv)
  myproc()->brk = BRK + 8;  // XXX so that brk-1 points within heap vma..
  myproc()->tf->rip = elf.entry;  // main
  
-  switchuvm(myproc());
+  switchvm(myproc());
  oldvmap->decref();

  gc_end_epoch();

--- a/kernel/hwvm.cc
+++ b/kernel/hwvm.cc
@@ -106,7 +106,7 @@ setupkshared(pgmap *pml4, char *kshared)

 // Switch h/w page table register to the kernel-only page table,
 // for when no process is running.
-void
+static void
 switchkvm(void)
 {
  lcr3(v2p(&kpml4));   // switch to the kernel page table
@@ -114,7 +114,7 @@ switchkvm(void)

 // Switch TSS and h/w page table to correspond to process p.
 void
-switchuvm(struct proc *p)
+switchvm(struct proc *p)
 {
  u64 base = (u64) &mycpu()->ts;
  pushcli();

--- a/kernel/sched.cc
+++ b/kernel/sched.cc
@@ -76,7 +76,7 @@ sched(void)
  mycpu()->proc = next;
  mycpu()->prev = prev;

-  switchuvm(next);
+  switchvm(next);
  set_proc_state(next, RUNNING);
  next->tsc = rdtsc();