summaryrefslogtreecommitdiff
path: root/proc.h
diff options
context:
space:
mode:
authorrsc <rsc>2009-05-31 05:12:21 +0000
committerrsc <rsc>2009-05-31 05:12:21 +0000
commit34295f461a416e40bb76e67c568a761222dc6913 (patch)
tree656ee29b7df282b32953ec927291a68cc0ff2124 /proc.h
parent949e55902bb0c976f74b5217b82deac65ff8d781 (diff)
downloadxv6-labs-34295f461a416e40bb76e67c568a761222dc6913.tar.gz
xv6-labs-34295f461a416e40bb76e67c568a761222dc6913.tar.bz2
xv6-labs-34295f461a416e40bb76e67c568a761222dc6913.zip
group locks into structs they protect.
few naming nits.
Diffstat (limited to 'proc.h')
-rw-r--r--proc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/proc.h b/proc.h
index d37975c..2c7fade 100644
--- a/proc.h
+++ b/proc.h
@@ -24,14 +24,14 @@ struct context {
uint eip;
};
-enum proc_state { UNUSED, EMBRYO, SLEEPING, RUNNABLE, RUNNING, ZOMBIE };
+enum procstate { UNUSED, EMBRYO, SLEEPING, RUNNABLE, RUNNING, ZOMBIE };
// Per-process state
struct proc {
char *mem; // Start of process memory (kernel address)
uint sz; // Size of process memory (bytes)
char *kstack; // Bottom of kernel stack for this process
- enum proc_state state; // Process state
+ enum procstate state; // Process state
volatile int pid; // Process ID
struct proc *parent; // Parent process
struct trapframe *tf; // Trap frame for current syscall