diff options
| author | Frans Kaashoek <[email protected]> | 2019-07-08 15:50:06 -0400 |
|---|---|---|
| committer | Frans Kaashoek <[email protected]> | 2019-07-08 15:50:06 -0400 |
| commit | 2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc (patch) | |
| tree | 189387b82cfd998170d39dfc998de0fc86602544 /kernel/proc.h | |
| parent | 75b0c6fc91c1264aaa5d080d9faeb87c90d02ad3 (diff) | |
| parent | 60ed537427c31d320ca4c8778d21d13304285b00 (diff) | |
| download | xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.gz xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.tar.bz2 xv6-labs-2f22a3ed6a8dbdd4dcfb2c0a43dc854a36a59cfc.zip | |
Merge branch 'riscv-proc' into riscv
Diffstat (limited to 'kernel/proc.h')
| -rw-r--r-- | kernel/proc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/proc.h b/kernel/proc.h index 278e4cd..687fdd1 100644 --- a/kernel/proc.h +++ b/kernel/proc.h @@ -78,10 +78,11 @@ struct trapframe { /* 280 */ uint64 t6; }; -enum procstate { UNUSED, EMBRYO, SLEEPING, RUNNABLE, RUNNING, ZOMBIE }; +enum procstate { UNUSED, SLEEPING, RUNNABLE, RUNNING, ZOMBIE }; // Per-process state struct proc { + struct spinlock lock; char *kstack; // Bottom of kernel stack for this process uint64 sz; // Size of process memory (bytes) pagetable_t pagetable; // Page table |