Permalink
Browse files

updates to process.c

  • Loading branch information...
Frankencelery committed Oct 28, 2012
1 parent 8d97b2c commit 1cc692135b90e16280d81382ac6ecaee863f0ca0
Showing with 0 additions and 7 deletions.
  1. +0 −7 src/userprog/process.c
View
@@ -149,14 +149,7 @@ process_wait (tid_t child_tid)
if (t == NULL){return -1;} if (t == NULL){return -1;}
sema_down(&(t->dead)); sema_down(&(t->dead));
<<<<<<< HEAD
=======
list_remove(e); list_remove(e);
//sema_up(&(t->dead));
//int temp = t->exit_code;
//t->exit_code = -1;
>>>>>>> 8a02d8392796aa4bae7b9e5f21034f6b66aaecca
return t->exit_code; return t->exit_code;
} }

0 comments on commit 1cc6921

Please sign in to comment.