Skip to content

Commit

Permalink
Merge branch 'master' of g.csail.mit.edu:xv6-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Morris committed Sep 15, 2016
2 parents aeaa308 + 3318866 commit d6dc5bc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 0 additions & 2 deletions exec.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ exec(char *path, char **argv)

begin_op();

cprintf("exec %s\n", path);
if((ip = namei(path)) == 0){
end_op();
return -1;
Expand Down Expand Up @@ -100,7 +99,6 @@ exec(char *path, char **argv)
proc->tf->esp = sp;
switchuvm(proc);
freevm(oldpgdir);
cprintf("exec succeeded\n");
return 0;

bad:
Expand Down
2 changes: 2 additions & 0 deletions runoff.list
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ sysproc.c

# file system
buf.h
sleeplock.h
fcntl.h
stat.h
fs.h
file.h
ide.c
bio.c
sleeplock.c
log.c
fs.c
file.c
Expand Down
2 changes: 1 addition & 1 deletion spinlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ release(struct spinlock *lk)

// Release the lock, equivalent to lk->locked = 0.
// This code can't use a C assignment, since it might
// not be atomic.
// not be atomic. A real OS would use C atomics here.
asm volatile("movl $0, %0" : "+m" (lk->locked) : );

popcli();
Expand Down

0 comments on commit d6dc5bc

Please sign in to comment.