summaryrefslogtreecommitdiff
path: root/mm/memory.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-02-04 08:57:44 +0100
committerIngo Molnar <mingo@kernel.org>2016-02-04 08:57:44 +0100
commitb83ea91f08f648460b08e8980560abdf96060a19 (patch)
tree1a6db205770ed7103afe0aa1234dec0b1227f380 /mm/memory.c
parent8eb22c984eb9eeaed47130f5679acd367af69678 (diff)
parent580df49eed6639263348af3ff60941ff14aa72c0 (diff)
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r--mm/memory.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/memory.c b/mm/memory.c
index 93ce37989471..635451abc8f7 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2237,11 +2237,6 @@ static int wp_page_shared(struct mm_struct *mm, struct vm_area_struct *vma,
page_cache_get(old_page);
- /*
- * Only catch write-faults on shared writable pages,
- * read-only shared pages can get COWed by
- * get_user_pages(.write=1, .force=1).
- */
if (vma->vm_ops && vma->vm_ops->page_mkwrite) {
int tmp;