---

yaml --- r: 9246 b: refs/heads/master c: dc36abf h: refs/heads/master v: v3
git-mirror · Sep 23, 2005 · ec8aa17 · ec8aa17
1 parent baac478
commit ec8aa17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 546fe1cbf91d4d62e3849517c31a2327c992e5c5
+refs/heads/master: dc36abf34e13aabbe06cdd060c434b3cdd80e7da
diff --git a/trunk/arch/um/kernel/tlb.c b/trunk/arch/um/kernel/tlb.c
@@ -193,12 +193,12 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
                 r = pte_read(*npte);
                 w = pte_write(*npte);
                 x = pte_exec(*npte);
-                if(!pte_dirty(*npte))
-                        w = 0;
-                if(!pte_young(*npte)){
-                        r = 0;
-                        w = 0;
-                }
+		if (!pte_young(*npte)) {
+			r = 0;
+			w = 0;
+		} else if (!pte_dirty(*npte)) {
+			w = 0;
+		}
                 if(force || pte_newpage(*npte)){
                         if(pte_present(*npte))
 			  ret = add_mmap(addr,