summaryrefslogtreecommitdiff
path: root/proc.h
diff options
context:
space:
mode:
authorRobert Morris <[email protected]>2017-08-08 13:27:06 -0400
committerRobert Morris <[email protected]>2017-08-08 13:27:06 -0400
commit14270288b7e5327832cdf6a8d9da52ef58fce652 (patch)
treeb604cb49fb049a14966418eda4589cd1271f8e53 /proc.h
parentaba8423c4a5ae01828040d04f668f07ec544dcd0 (diff)
parent825ce074b10a0e1f63fd3a1fe245220d04054e0a (diff)
downloadxv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.tar.gz
xv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.tar.bz2
xv6-labs-14270288b7e5327832cdf6a8d9da52ef58fce652.zip
Merge branch 'master' of g.csail.mit.edu:xv6-dev
Diffstat (limited to 'proc.h')
-rw-r--r--proc.h16
1 files changed, 1 insertions, 15 deletions
diff --git a/proc.h b/proc.h
index 7352805..1647114 100644
--- a/proc.h
+++ b/proc.h
@@ -7,26 +7,12 @@ struct cpu {
volatile uint started; // Has the CPU started?
int ncli; // Depth of pushcli nesting.
int intena; // Were interrupts enabled before pushcli?
-
- // Cpu-local storage variables; see below
- struct cpu *cpu;
- struct proc *proc; // The currently-running process.
+ struct proc *proc; // The process running on this cpu or null
};
extern struct cpu cpus[NCPU];
extern int ncpu;
-// Per-CPU variables, holding pointers to the
-// current cpu and to the current process.
-// The asm suffix tells gcc to use "%gs:0" to refer to cpu
-// and "%gs:4" to refer to proc. seginit sets up the
-// %gs segment register so that %gs refers to the memory
-// holding those two variables in the local cpu's struct cpu.
-// This is similar to how thread-local variables are implemented
-// in thread libraries such as Linux pthreads.
-extern struct cpu *cpu asm("%gs:0"); // &cpus[cpunum()]
-extern struct proc *proc asm("%gs:4"); // cpus[cpunum()].proc
-
//PAGEBREAK: 17
// Saved registers for kernel context switches.
// Don't need to save all the segment registers (%cs, etc),