diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-29 11:23:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-29 11:23:32 +0100 |
| commit | aac898548d04c7bff179b79f805874b0d6f87571 (patch) | |
| tree | e8de975fd5de6c95bf4329861a872dbcfe0c7ead /mm/mprotect.c | |
| parent | 2f5e98802350627ad6f2e3cee4d177059fc0c2f2 (diff) | |
| parent | cd65718712469ad844467250e8fad20a5838baae (diff) | |
| download | kernel_replicant_linux-aac898548d04c7bff179b79f805874b0d6f87571.tar.gz kernel_replicant_linux-aac898548d04c7bff179b79f805874b0d6f87571.tar.bz2 kernel_replicant_linux-aac898548d04c7bff179b79f805874b0d6f87571.zip | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/hist.h
Diffstat (limited to 'mm/mprotect.c')
| -rw-r--r-- | mm/mprotect.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mm/mprotect.c b/mm/mprotect.c index 94722a4d6b43..a3af058f68e4 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -94,13 +94,16 @@ static unsigned long change_pte_range(struct vm_area_struct *vma, pmd_t *pmd, swp_entry_t entry = pte_to_swp_entry(oldpte); if (is_write_migration_entry(entry)) { + pte_t newpte; /* * A protection check is difficult so * just be safe and disable write */ make_migration_entry_read(&entry); - set_pte_at(mm, addr, pte, - swp_entry_to_pte(entry)); + newpte = swp_entry_to_pte(entry); + if (pte_swp_soft_dirty(oldpte)) + newpte = pte_swp_mksoft_dirty(newpte); + set_pte_at(mm, addr, pte, newpte); } pages++; } |