Imbus/xv6-riscv-kernel
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of g.csail.mit.edu:xv6-dev

Browse source
This commit is contained in:
Robert Morris 2016-09-15 12:56:17 -04:00
commit d6dc5bcb2d
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exec.c
View file

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

2
runoff.list
View file

@ -35,12 +35,14 @@ sysproc.c
# file system # file system
buf.h buf.h
sleeplock.h
fcntl.h fcntl.h
stat.h stat.h
fs.h fs.h
file.h file.h
ide.c ide.c
bio.c bio.c
sleeplock.c
log.c log.c
fs.c fs.c
file.c file.c

2
spinlock.c
View file

@ -61,7 +61,7 @@ release(struct spinlock *lk)
// Release the lock, equivalent to lk->locked = 0. // Release the lock, equivalent to lk->locked = 0.
// This code can't use a C assignment, since it might // 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) : ); asm volatile("movl $0, %0" : "+m" (lk->locked) : );
popcli(); popcli();