diff options
| author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2016-07-27 00:25:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-27 01:19:19 +0200 |
| commit | b237aded41cd68f378650209e8a10c04a25da258 (patch) | |
| tree | c34746bdbf89173310c216661ba32cf90f91bfc3 /mm/huge_memory.c | |
| parent | thp: skip file huge pmd on copy_huge_pmd() (diff) | |
| download | linux-b237aded41cd68f378650209e8a10c04a25da258.tar.xz linux-b237aded41cd68f378650209e8a10c04a25da258.zip | |
thp: prepare change_huge_pmd() for file thp
change_huge_pmd() has assert which is not relvant for file page. For
shared mapping it's perfectly fine to have page table entry writable,
without explicit mkwrite.
Link: http://lkml.kernel.org/r/1466021202-61880-18-git-send-email-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | mm/huge_memory.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index c11cfce4d9d9..3a20f11248a1 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1788,7 +1788,8 @@ int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, entry = pmd_mkwrite(entry); ret = HPAGE_PMD_NR; set_pmd_at(mm, addr, pmd, entry); - BUG_ON(!preserve_write && pmd_write(entry)); + BUG_ON(vma_is_anonymous(vma) && !preserve_write && + pmd_write(entry)); } spin_unlock(ptl); } |