diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /arch/um/kernel/tlb.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/kernel/tlb.c')
| -rw-r--r-- | arch/um/kernel/tlb.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c index 80ed6188e8a2..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, |
| @@ -307,7 +307,7 @@ int flush_tlb_kernel_range_common(unsigned long start, unsigned long end) | |||
| 307 | } | 307 | } |
| 308 | else if(pte_newprot(*pte)){ | 308 | else if(pte_newprot(*pte)){ |
| 309 | updated = 1; | 309 | updated = 1; |
| 310 | protect_memory(addr, PAGE_SIZE, 1, 1, 1, 1); | 310 | os_protect_memory((void *) addr, PAGE_SIZE, 1, 1, 1); |
| 311 | } | 311 | } |
| 312 | addr += PAGE_SIZE; | 312 | addr += PAGE_SIZE; |
| 313 | } | 313 | } |