diff options
| author | Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local> | 2010-08-26 08:03:18 -0400 |
|---|---|---|
| committer | Frans Kaashoek <kaashoek@Frans-Kaashoeks-MacBook-Pro.local> | 2010-08-26 08:03:18 -0400 |
| commit | d55b2fac074ac23e30c337014f40ae2156b31b60 (patch) | |
| tree | bb9885972bf8929e7957f9ea512a8befaf06b11c /defs.h | |
| parent | d87f51c5a1c5e7a2a3ba111b1052a297f4f96fb0 (diff) | |
| parent | 789b508d538e6faf635e49f268a4f1f9e9b65f05 (diff) | |
| download | xv6-labs-d55b2fac074ac23e30c337014f40ae2156b31b60.tar.gz xv6-labs-d55b2fac074ac23e30c337014f40ae2156b31b60.tar.bz2 xv6-labs-d55b2fac074ac23e30c337014f40ae2156b31b60.zip | |
Merge commit 'origin/page' into page
Diffstat (limited to 'defs.h')
| -rw-r--r-- | defs.h | 12 |
1 files changed, 4 insertions, 8 deletions
@@ -110,7 +110,6 @@ void yield(void); // swtch.S void swtch(struct context**, struct context*); -void jstack(uint); // spinlock.c void acquire(struct spinlock*); @@ -143,7 +142,7 @@ void timerinit(void); // trap.c void idtinit(void); -extern int ticks; +extern uint ticks; void tvinit(void); extern struct spinlock tickslock; @@ -153,23 +152,20 @@ void uartintr(void); void uartputc(int); // vm.c -#define PGROUNDUP(sz) ((sz+PGSIZE-1) & ~(PGSIZE-1)) -extern pde_t *kpgdir; void pminit(void); void ksegment(void); void kvmalloc(void); void vminit(void); -void jkstack(); -void printstack(void); -void printpgdir(pde_t *); pde_t* setupkvm(void); char* uva2ka(pde_t*, char*); int allocuvm(pde_t*, char*, uint); +int deallocuvm(pde_t *pgdir, char *addr, uint sz); void freevm(pde_t*); void inituvm(pde_t*, char*, char*, uint); int loaduvm(pde_t*, char*, struct inode *ip, uint, uint); pde_t* copyuvm(pde_t*,uint); -void loadvm(struct proc*); +void switchuvm(struct proc*); +void switchkvm(); // number of elements in fixed-size array #define NELEM(x) (sizeof(x)/sizeof((x)[0])) |