diff options
Diffstat (limited to 'kernel/proc.h')
| -rw-r--r-- | kernel/proc.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/proc.h b/kernel/proc.h index 538b48a..9c16ea7 100644 --- a/kernel/proc.h +++ b/kernel/proc.h @@ -21,7 +21,7 @@ struct context { // Per-CPU state. struct cpu { struct proc *proc; // The process running on this cpu, or null. - struct context scheduler; // swtch() here to enter scheduler(). + struct context context; // swtch() here to enter scheduler(). int noff; // Depth of push_off() nesting. int intena; // Were interrupts enabled before push_off()? }; @@ -95,10 +95,10 @@ struct proc { int pid; // Process ID // these are private to the process, so p->lock need not be held. - uint64 kstack; // Bottom of kernel stack for this process + uint64 kstack; // Virtual address of kernel stack uint64 sz; // Size of process memory (bytes) - pagetable_t pagetable; // Page table - struct trapframe *tf; // data page for trampoline.S + pagetable_t pagetable; // User page table + struct trapframe *trapframe; // data page for trampoline.S struct context context; // swtch() here to run process struct file *ofile[NOFILE]; // Open files struct inode *cwd; // Current directory |