Commit dc36abf3 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 546fe1cb
...@@ -193,12 +193,12 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr, ...@@ -193,12 +193,12 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
r = pte_read(*npte); r = pte_read(*npte);
w = pte_write(*npte); w = pte_write(*npte);
x = pte_exec(*npte); x = pte_exec(*npte);
if(!pte_dirty(*npte)) if (!pte_young(*npte)) {
w = 0; r = 0;
if(!pte_young(*npte)){ w = 0;
r = 0; } else if (!pte_dirty(*npte)) {
w = 0; w = 0;
} }
if(force || pte_newpage(*npte)){ if(force || pte_newpage(*npte)){
if(pte_present(*npte)) if(pte_present(*npte))
ret = add_mmap(addr, ret = add_mmap(addr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment