summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorrtm <rtm>2006-07-29 09:35:02 +0000
committerrtm <rtm>2006-07-29 09:35:02 +0000
commit32630628a996e29018641af262272339ed6fef88 (patch)
tree73c9a7dee75f96c0ce0e9c804d379dd60bf254b4 /proc.c
parente46fb46fcf4302bf5ed913101c5c7b510fe03ad4 (diff)
downloadxv6-labs-32630628a996e29018641af262272339ed6fef88.tar.gz
xv6-labs-32630628a996e29018641af262272339ed6fef88.tar.bz2
xv6-labs-32630628a996e29018641af262272339ed6fef88.zip
open()
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/proc.c b/proc.c
index 4e44a8e..b67810e 100644
--- a/proc.c
+++ b/proc.c
@@ -7,7 +7,7 @@
#include "defs.h"
#include "spinlock.h"
-struct spinlock proc_table_lock;
+struct spinlock proc_table_lock = { "proc_table" };
struct proc proc[NPROC];
struct proc *curproc[NCPU];
@@ -137,8 +137,10 @@ scheduler(void)
cprintf("start scheduler on cpu %d jmpbuf %p\n", cpu(), &cpus[cpu()].jmpbuf);
cpus[cpu()].lastproc = &proc[0];
- if(cpus[cpu()].nlock != 0)
+ if(cpus[cpu()].nlock != 0){
+ cprintf("la %x lr %x\n", cpus[cpu()].lastacquire, cpus[cpu()].lastrelease );
panic("holding locks at first entry to scheduler");
+ }
for(;;){
// Loop over process table looking for process to run.