From dd4e1e12a318386f43d8e569fae02d4db0d9dea0 Mon Sep 17 00:00:00 2001 From: ArchStacker Date: Mon, 11 May 2015 08:12:43 +0800 Subject: [PATCH 1/3] Correct a spelling mistake --- labcodes/lab4/kern/process/proc.c | 4 ++-- labcodes/lab5/kern/process/proc.c | 4 ++-- labcodes/lab6/kern/process/proc.c | 4 ++-- labcodes/lab7/kern/process/proc.c | 4 ++-- labcodes/lab8/kern/process/proc.c | 4 ++-- labcodes_answer/lab4_result/kern/process/proc.c | 4 ++-- labcodes_answer/lab5_result/kern/process/proc.c | 4 ++-- labcodes_answer/lab6_result/kern/process/proc.c | 4 ++-- labcodes_answer/lab7_result/kern/process/proc.c | 4 ++-- labcodes_answer/lab8_result/kern/process/proc.c | 4 ++-- related_info/lab4/lab4-spoc-discuss/kern/process/proc.c | 4 ++-- related_info/lab5/lab5-spoc-discuss/kern/process/proc.c | 4 ++-- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/labcodes/lab4/kern/process/proc.c b/labcodes/lab4/kern/process/proc.c index 9c0b0e3..11e734c 100644 --- a/labcodes/lab4/kern/process/proc.c +++ b/labcodes/lab4/kern/process/proc.c @@ -283,7 +283,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -294,7 +294,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid fork_out: return ret; diff --git a/labcodes/lab5/kern/process/proc.c b/labcodes/lab5/kern/process/proc.c index 2cacac3..a96ba4c 100644 --- a/labcodes/lab5/kern/process/proc.c +++ b/labcodes/lab5/kern/process/proc.c @@ -382,7 +382,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -393,7 +393,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) diff --git a/labcodes/lab6/kern/process/proc.c b/labcodes/lab6/kern/process/proc.c index 5f5e1bc..ad9e308 100644 --- a/labcodes/lab6/kern/process/proc.c +++ b/labcodes/lab6/kern/process/proc.c @@ -392,7 +392,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -403,7 +403,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) diff --git a/labcodes/lab7/kern/process/proc.c b/labcodes/lab7/kern/process/proc.c index 323a81b..42761de 100644 --- a/labcodes/lab7/kern/process/proc.c +++ b/labcodes/lab7/kern/process/proc.c @@ -392,7 +392,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -403,7 +403,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) diff --git a/labcodes/lab8/kern/process/proc.c b/labcodes/lab8/kern/process/proc.c index b6cccf8..92ee46e 100644 --- a/labcodes/lab8/kern/process/proc.c +++ b/labcodes/lab8/kern/process/proc.c @@ -440,7 +440,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -451,7 +451,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) diff --git a/labcodes_answer/lab4_result/kern/process/proc.c b/labcodes_answer/lab4_result/kern/process/proc.c index 36e1348..6d3d56f 100644 --- a/labcodes_answer/lab4_result/kern/process/proc.c +++ b/labcodes_answer/lab4_result/kern/process/proc.c @@ -295,7 +295,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -306,7 +306,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; diff --git a/labcodes_answer/lab5_result/kern/process/proc.c b/labcodes_answer/lab5_result/kern/process/proc.c index 686708a..c6c5ee0 100644 --- a/labcodes_answer/lab5_result/kern/process/proc.c +++ b/labcodes_answer/lab5_result/kern/process/proc.c @@ -390,7 +390,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -401,7 +401,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; diff --git a/labcodes_answer/lab6_result/kern/process/proc.c b/labcodes_answer/lab6_result/kern/process/proc.c index 8c61e68..35c1333 100644 --- a/labcodes_answer/lab6_result/kern/process/proc.c +++ b/labcodes_answer/lab6_result/kern/process/proc.c @@ -396,7 +396,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -407,7 +407,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; diff --git a/labcodes_answer/lab7_result/kern/process/proc.c b/labcodes_answer/lab7_result/kern/process/proc.c index eb538b8..88e6cd0 100644 --- a/labcodes_answer/lab7_result/kern/process/proc.c +++ b/labcodes_answer/lab7_result/kern/process/proc.c @@ -402,7 +402,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -413,7 +413,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) diff --git a/labcodes_answer/lab8_result/kern/process/proc.c b/labcodes_answer/lab8_result/kern/process/proc.c index efd2bd9..f9759fe 100644 --- a/labcodes_answer/lab8_result/kern/process/proc.c +++ b/labcodes_answer/lab8_result/kern/process/proc.c @@ -449,7 +449,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -460,7 +460,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid //LAB5 YOUR CODE : (update LAB4 steps) diff --git a/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c b/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c index 9eaed2f..af99ebc 100644 --- a/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c +++ b/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c @@ -266,7 +266,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -281,7 +281,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { copy_thread(proc, stack, tf); // 4. insert proc_struct into proc_list list_add_before(&proc_list, &proc->list_link); - // 5. call wakup_proc to make the new child process RUNNABLE + // 5. call wakeup_proc to make the new child process RUNNABLE wakeup_proc(proc); // 7. set ret vaule using child proc's pid nr_process++; diff --git a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c index 686708a..c6c5ee0 100644 --- a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c +++ b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c @@ -390,7 +390,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set @@ -401,7 +401,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { // 3. call copy_mm to dup OR share mm according clone_flag // 4. call copy_thread to setup tf & context in proc_struct // 5. insert proc_struct into hash_list && proc_list - // 6. call wakup_proc to make the new child process RUNNABLE + // 6. call wakeup_proc to make the new child process RUNNABLE // 7. set ret vaule using child proc's pid if ((proc = alloc_proc()) == NULL) { goto fork_out; From 87248a2704a6cfec589bf6619a07970fa399705f Mon Sep 17 00:00:00 2001 From: ArchStacker Date: Mon, 11 May 2015 08:24:55 +0800 Subject: [PATCH 2/3] Remove the addition space --- labcodes/lab4/kern/process/proc.c | 2 +- labcodes/lab5/kern/process/proc.c | 2 +- labcodes/lab6/kern/process/proc.c | 2 +- labcodes/lab7/kern/process/proc.c | 2 +- labcodes/lab8/kern/process/proc.c | 2 +- labcodes_answer/lab4_result/kern/process/proc.c | 2 +- labcodes_answer/lab5_result/kern/process/proc.c | 2 +- labcodes_answer/lab6_result/kern/process/proc.c | 2 +- labcodes_answer/lab7_result/kern/process/proc.c | 2 +- labcodes_answer/lab8_result/kern/process/proc.c | 2 +- related_info/lab4/lab4-spoc-discuss/kern/process/proc.c | 2 +- related_info/lab5/lab5-spoc-discuss/kern/process/proc.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/labcodes/lab4/kern/process/proc.c b/labcodes/lab4/kern/process/proc.c index 11e734c..7d57c65 100644 --- a/labcodes/lab4/kern/process/proc.c +++ b/labcodes/lab4/kern/process/proc.c @@ -283,7 +283,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes/lab5/kern/process/proc.c b/labcodes/lab5/kern/process/proc.c index a96ba4c..569728a 100644 --- a/labcodes/lab5/kern/process/proc.c +++ b/labcodes/lab5/kern/process/proc.c @@ -382,7 +382,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes/lab6/kern/process/proc.c b/labcodes/lab6/kern/process/proc.c index ad9e308..874e835 100644 --- a/labcodes/lab6/kern/process/proc.c +++ b/labcodes/lab6/kern/process/proc.c @@ -392,7 +392,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes/lab7/kern/process/proc.c b/labcodes/lab7/kern/process/proc.c index 42761de..1929aa0 100644 --- a/labcodes/lab7/kern/process/proc.c +++ b/labcodes/lab7/kern/process/proc.c @@ -392,7 +392,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes/lab8/kern/process/proc.c b/labcodes/lab8/kern/process/proc.c index 92ee46e..2288968 100644 --- a/labcodes/lab8/kern/process/proc.c +++ b/labcodes/lab8/kern/process/proc.c @@ -440,7 +440,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes_answer/lab4_result/kern/process/proc.c b/labcodes_answer/lab4_result/kern/process/proc.c index 6d3d56f..f0a9e36 100644 --- a/labcodes_answer/lab4_result/kern/process/proc.c +++ b/labcodes_answer/lab4_result/kern/process/proc.c @@ -295,7 +295,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes_answer/lab5_result/kern/process/proc.c b/labcodes_answer/lab5_result/kern/process/proc.c index c6c5ee0..8f4c2e7 100644 --- a/labcodes_answer/lab5_result/kern/process/proc.c +++ b/labcodes_answer/lab5_result/kern/process/proc.c @@ -390,7 +390,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes_answer/lab6_result/kern/process/proc.c b/labcodes_answer/lab6_result/kern/process/proc.c index 35c1333..0b47a0d 100644 --- a/labcodes_answer/lab6_result/kern/process/proc.c +++ b/labcodes_answer/lab6_result/kern/process/proc.c @@ -396,7 +396,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes_answer/lab7_result/kern/process/proc.c b/labcodes_answer/lab7_result/kern/process/proc.c index 88e6cd0..98090e0 100644 --- a/labcodes_answer/lab7_result/kern/process/proc.c +++ b/labcodes_answer/lab7_result/kern/process/proc.c @@ -402,7 +402,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/labcodes_answer/lab8_result/kern/process/proc.c b/labcodes_answer/lab8_result/kern/process/proc.c index f9759fe..f3f3ca9 100644 --- a/labcodes_answer/lab8_result/kern/process/proc.c +++ b/labcodes_answer/lab8_result/kern/process/proc.c @@ -449,7 +449,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c b/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c index af99ebc..b54ee2a 100644 --- a/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c +++ b/related_info/lab4/lab4-spoc-discuss/kern/process/proc.c @@ -266,7 +266,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set diff --git a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c index c6c5ee0..8f4c2e7 100644 --- a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c +++ b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c @@ -390,7 +390,7 @@ do_fork(uint32_t clone_flags, uintptr_t stack, struct trapframe *tf) { * setup the kernel entry point and stack of process * hash_proc: add proc into proc hash_list * get_pid: alloc a unique pid for process - * wakeup_proc: set proc->state = PROC_RUNNABLE + * wakeup_proc: set proc->state = PROC_RUNNABLE * VARIABLES: * proc_list: the process set's list * nr_process: the number of process set From 6fbc1fa90b0d41153f004b1772ad8975d3a69f13 Mon Sep 17 00:00:00 2001 From: ArchStacker Date: Sun, 7 Jun 2015 08:03:34 +0800 Subject: [PATCH 3/3] Correct the wrong spelling of put_pgdir --- labcodes/lab5/kern/process/proc.c | 2 +- labcodes/lab6/kern/process/proc.c | 2 +- labcodes/lab7/kern/process/proc.c | 2 +- labcodes/lab8/kern/process/proc.c | 2 +- labcodes_answer/lab5_result/kern/process/proc.c | 2 +- labcodes_answer/lab6_result/kern/process/proc.c | 2 +- labcodes_answer/lab7_result/kern/process/proc.c | 2 +- labcodes_answer/lab8_result/kern/process/proc.c | 2 +- related_info/lab5/lab5-spoc-discuss/kern/process/proc.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/labcodes/lab5/kern/process/proc.c b/labcodes/lab5/kern/process/proc.c index 569728a..e6ff1f3 100644 --- a/labcodes/lab5/kern/process/proc.c +++ b/labcodes/lab5/kern/process/proc.c @@ -615,7 +615,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes/lab6/kern/process/proc.c b/labcodes/lab6/kern/process/proc.c index 874e835..54aea05 100644 --- a/labcodes/lab6/kern/process/proc.c +++ b/labcodes/lab6/kern/process/proc.c @@ -625,7 +625,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes/lab7/kern/process/proc.c b/labcodes/lab7/kern/process/proc.c index 1929aa0..33821f7 100644 --- a/labcodes/lab7/kern/process/proc.c +++ b/labcodes/lab7/kern/process/proc.c @@ -625,7 +625,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes/lab8/kern/process/proc.c b/labcodes/lab8/kern/process/proc.c index 2288968..fc239eb 100644 --- a/labcodes/lab8/kern/process/proc.c +++ b/labcodes/lab8/kern/process/proc.c @@ -609,7 +609,7 @@ failed_cleanup: return ret; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, int argc, const char **argv) { diff --git a/labcodes_answer/lab5_result/kern/process/proc.c b/labcodes_answer/lab5_result/kern/process/proc.c index 8f4c2e7..31e42ad 100644 --- a/labcodes_answer/lab5_result/kern/process/proc.c +++ b/labcodes_answer/lab5_result/kern/process/proc.c @@ -647,7 +647,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes_answer/lab6_result/kern/process/proc.c b/labcodes_answer/lab6_result/kern/process/proc.c index 0b47a0d..993869c 100644 --- a/labcodes_answer/lab6_result/kern/process/proc.c +++ b/labcodes_answer/lab6_result/kern/process/proc.c @@ -653,7 +653,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes_answer/lab7_result/kern/process/proc.c b/labcodes_answer/lab7_result/kern/process/proc.c index 98090e0..9431cf6 100644 --- a/labcodes_answer/lab7_result/kern/process/proc.c +++ b/labcodes_answer/lab7_result/kern/process/proc.c @@ -667,7 +667,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) { diff --git a/labcodes_answer/lab8_result/kern/process/proc.c b/labcodes_answer/lab8_result/kern/process/proc.c index f3f3ca9..6182379 100644 --- a/labcodes_answer/lab8_result/kern/process/proc.c +++ b/labcodes_answer/lab8_result/kern/process/proc.c @@ -801,7 +801,7 @@ failed_cleanup: return ret; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, int argc, const char **argv) { diff --git a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c index 8f4c2e7..31e42ad 100644 --- a/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c +++ b/related_info/lab5/lab5-spoc-discuss/kern/process/proc.c @@ -647,7 +647,7 @@ bad_mm: goto out; } -// do_execve - call exit_mmap(mm)&pug_pgdir(mm) to reclaim memory space of current process +// do_execve - call exit_mmap(mm)&put_pgdir(mm) to reclaim memory space of current process // - call load_icode to setup new memory space accroding binary prog. int do_execve(const char *name, size_t len, unsigned char *binary, size_t size) {