diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-09-23 00:44:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 01:17:36 -0400 |
| commit | dc36abf34e13aabbe06cdd060c434b3cdd80e7da (patch) | |
| tree | 2ad214661db54b424154c90eee71cb7b2fb410aa | |
| parent | 546fe1cbf91d4d62e3849517c31a2327c992e5c5 (diff) | |
[PATCH] uml: fix condition in tlb flush
Avoid setting w = 0 twice. Spotted this (trivial) thing which is needed for
another patch.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/kernel/tlb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index 0a562c3c0fd8..f5b0636f9ad7 100644 --- a/arch/um/kernel/tlb.c +++ b/arch/um/kernel/tlb.c | |||
| @@ -193,12 +193,12 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, | |||
| 193 | r = pte_read(*npte); | 193 | r = pte_read(*npte); |
| 194 | w = pte_write(*npte); | 194 | w = pte_write(*npte); |
| 195 | x = pte_exec(*npte); | 195 | x = pte_exec(*npte); |
| 196 | if(!pte_dirty(*npte)) | 196 | if (!pte_young(*npte)) { |
| 197 | w = 0; | 197 | r = 0; |
| 198 | if(!pte_young(*npte)){ | 198 | w = 0; |
| 199 | r = 0; | 199 | } else if (!pte_dirty(*npte)) { |
| 200 | w = 0; | 200 | w = 0; |
| 201 | } | 201 | } |
| 202 | if(force || pte_newpage(*npte)){ | 202 | if(force || pte_newpage(*npte)){ |
| 203 | if(pte_present(*npte)) | 203 | if(pte_present(*npte)) |
| 204 | ret = add_mmap(addr, | 204 | ret = add_mmap(addr, |