diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2016-06-24 17:49:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-24 20:23:52 -0400 |
commit | 315d09bf30c2b436a1fdac86d31c24380cd56c4f (patch) | |
tree | fa85cc65d0850806f589d6fc525c6036afb308b4 /mm/filemap.c | |
parent | 1f08fe266560fc2d1383fd9c8c08fdd432ea302b (diff) |
Revert "mm: make faultaround produce old ptes"
This reverts commit 5c0a85fad949212b3e059692deecdeed74ae7ec7.
The commit causes ~6% regression in unixbench.
Let's revert it for now and consider other solution for reclaim problem
later.
Link: http://lkml.kernel.org/r/1465893750-44080-2-git-send-email-kirill.shutemov@linux.intel.com
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Vinayak Menon <vinmenon@codeaurora.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/filemap.c')
-rw-r--r-- | mm/filemap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index 00ae878b2a38..20f3b1f33f0e 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
@@ -2186,7 +2186,7 @@ repeat: | |||
2186 | if (file->f_ra.mmap_miss > 0) | 2186 | if (file->f_ra.mmap_miss > 0) |
2187 | file->f_ra.mmap_miss--; | 2187 | file->f_ra.mmap_miss--; |
2188 | addr = address + (page->index - vmf->pgoff) * PAGE_SIZE; | 2188 | addr = address + (page->index - vmf->pgoff) * PAGE_SIZE; |
2189 | do_set_pte(vma, addr, page, pte, false, false, true); | 2189 | do_set_pte(vma, addr, page, pte, false, false); |
2190 | unlock_page(page); | 2190 | unlock_page(page); |
2191 | goto next; | 2191 | goto next; |
2192 | unlock: | 2192 | unlock: |