diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/um/kernel/tlb.c | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/um/kernel/tlb.c')
| -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, |