diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-02-22 10:26:05 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-02-22 10:26:05 +0300 |
commit | ab876728a91d89e93e4928895529cd5bb4dff6e4 (patch) | |
tree | 3aa7603c289f79a570cf15e4019b1acb9459e608 /mm/memory.c | |
parent | 35575e0e8ba633fc8276509a21f89b599b4f9006 (diff) | |
parent | 81f70ba233d5f660e1ea5fe23260ee323af5d53a (diff) | |
download | linux-ab876728a91d89e93e4928895529cd5bb4dff6e4.tar.xz |
Merge tag 'v4.5-rc5' into efi/core, before queueing up new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/memory.c')
-rw-r--r-- | mm/memory.c | 5 |
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; |