summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/proc.c b/proc.c
index ba6905b..4a05098 100644
--- a/proc.c
+++ b/proc.c
@@ -13,7 +13,7 @@ struct proc proc[NPROC];
struct proc *curproc[NCPU];
int next_pid = 1;
extern void forkret(void);
-extern void forkret1(struct Trapframe*);
+extern void forkret1(struct trapframe*);
/*
* set up a process's task state and segment descriptors
@@ -24,7 +24,7 @@ extern void forkret1(struct Trapframe*);
void
setupsegs(struct proc *p)
{
- memset(&p->ts, 0, sizeof(struct Taskstate));
+ memset(&p->ts, 0, sizeof(struct taskstate));
p->ts.ss0 = SEG_KDATA << 3;
p->ts.esp0 = (uint)(p->kstack + KSTACKSIZE);
@@ -100,7 +100,7 @@ copyproc(struct proc* p)
setupsegs(np);
// Copy trapframe registers from parent.
- np->tf = (struct Trapframe*)(np->kstack + KSTACKSIZE) - 1;
+ np->tf = (struct trapframe*)(np->kstack + KSTACKSIZE) - 1;
*np->tf = *p->tf;
// Clear %eax so that fork system call returns 0 in child.