Browse Source

Plan 9 from Bell Labs 2003-04-05

David du Colombier 21 years ago
parent
commit
125e640a35
3 changed files with 8 additions and 7 deletions
  1. 1 1
      dist/replica/plan9.db
  2. 1 0
      dist/replica/plan9.log
  3. 6 6
      sys/src/9/pc/mmu.c

+ 1 - 1
dist/replica/plan9.db

@@ -5159,7 +5159,7 @@ sys/src/9/pc/main.c - 664 sys sys 1048644107 14454
 sys/src/9/pc/mem.h - 664 sys sys 1018553448 4573
 sys/src/9/pc/memory.c - 664 sys sys 1032303986 12994
 sys/src/9/pc/mkfile - 664 sys sys 1040002514 2995
-sys/src/9/pc/mmu.c - 664 sys sys 1018553449 10008
+sys/src/9/pc/mmu.c - 664 sys sys 1049509456 10014
 sys/src/9/pc/mouse.c - 664 sys sys 1020369766 6315
 sys/src/9/pc/mp.c - 664 sys sys 1048644112 16928
 sys/src/9/pc/mp.h - 664 sys sys 1015014520 6575

+ 1 - 0
dist/replica/plan9.log

@@ -19066,3 +19066,4 @@
 1049428865 2 c 386/bin/ndb/dnsdebug - 775 sys sys 1049428257 186400
 1049428865 3 c 386/bin/ndb/dnstcp - 775 sys sys 1049428258 185185
 1049428865 4 c 386/bin/upas/smtpd - 775 sys sys 1049428259 312341
+1049509869 0 c sys/src/9/pc/mmu.c - 664 sys sys 1049509456 10014

+ 6 - 6
sys/src/9/pc/mmu.c

@@ -327,14 +327,14 @@ mmukmapsync(ulong va)
 
 	mach0 = MACHP(0);
 
-	lock(&mmukmaplock);
+	ilock(&mmukmaplock);
 
 	if((pte = mmuwalk(mach0->pdb, va, 1, 0)) == nil){
-		unlock(&mmukmaplock);
+		iunlock(&mmukmaplock);
 		return 0;
 	}
 	if(!(*pte & PTESIZE) && mmuwalk(mach0->pdb, va, 2, 0) == nil){
-		unlock(&mmukmaplock);
+		iunlock(&mmukmaplock);
 		return 0;
 	}
 	entry = *pte;
@@ -349,7 +349,7 @@ mmukmapsync(ulong va)
 	else
 		mmuflushtlb(PADDR(m->pdb));
 
-	unlock(&mmukmaplock);
+	iunlock(&mmukmaplock);
 
 	return 1;
 }
@@ -376,7 +376,7 @@ mmukmap(ulong pa, ulong va, int size)
 	ova = va;
 
 	pae = pa + size;
-	lock(&mmukmaplock);
+	ilock(&mmukmaplock);
 	while(pa < pae){
 		table = &mach0->pdb[PDX(va)];
 		/*
@@ -457,7 +457,7 @@ mmukmap(ulong pa, ulong va, int size)
 		va += pgsz;
 		sync++;
 	}
-	unlock(&mmukmaplock);
+	iunlock(&mmukmaplock);
 
 	/*
 	 * If something was added