summaryrefslogtreecommitdiff
path: root/proc.h
diff options
context:
space:
mode:
authorrsc <rsc>2007-09-27 20:32:45 +0000
committerrsc <rsc>2007-09-27 20:32:45 +0000
commit4f74de0edc243ffdae0233eb5c84d09c44677ccf (patch)
treea06bec65e5b6ad8db480963ffc6646a176baa8da /proc.h
parentce2e7515552adca3a60e349de2931112736d17bf (diff)
downloadxv6-labs-4f74de0edc243ffdae0233eb5c84d09c44677ccf.tar.gz
xv6-labs-4f74de0edc243ffdae0233eb5c84d09c44677ccf.tar.bz2
xv6-labs-4f74de0edc243ffdae0233eb5c84d09c44677ccf.zip
okay, that was long enough - revert
Diffstat (limited to 'proc.h')
-rw-r--r--proc.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/proc.h b/proc.h
index a2abb82..2063baa 100644
--- a/proc.h
+++ b/proc.h
@@ -46,10 +46,6 @@ struct proc {
char name[16]; // Process name (debugging)
};
-// The word at kstack + KSTACKTOP is a pointer to the struct proc.
-#define KSTACKTOP (KSTACKSIZE-4)
-
-
// Process memory is laid out contiguously, low addresses first:
// text
// original data and bss
@@ -59,6 +55,7 @@ struct proc {
// Per-CPU state
struct cpu {
uchar apicid; // Local APIC ID
+ struct proc *curproc; // Process currently running.
struct context context; // Switch here to enter scheduler
struct taskstate ts; // Used by x86 to find stack for interrupt
struct segdesc gdt[NSEGS]; // x86 global descriptor table