diff options
| author | Johannes Weiner <hannes@cmpxchg.org> | 2013-09-11 14:20:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-11 15:57:23 -0700 |
| commit | 72457c0a05ed06f978d3a8a7c9d5ad527db88b4c (patch) | |
| tree | 649869a49b7eb64b90b0e6e74ca43f3cd1b01983 /mm/page-writeback.c | |
| parent | 81c0a2bb515fd4daae8cab64352877480792b515 (diff) | |
| download | blackbird-op-linux-72457c0a05ed06f978d3a8a7c9d5ad527db88b4c.tar.gz blackbird-op-linux-72457c0a05ed06f978d3a8a7c9d5ad527db88b4c.zip | |
mm: revert "page-writeback.c: subtract min_free_kbytes from dirtyable memory"
This reverts commit 75f7ad8e043d. It was the result of a problem
observed with a 3.2 kernel and merged in 3.9, while the issue had been
resolved upstream in 3.3 (commit ab8fabd46f81: "mm: exclude reserved
pages from dirtyable memory").
The "reserved pages" are a superset of min_free_kbytes, thus this change
is redundant and confusing. Revert it.
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: Paul Szabo <psz@maths.usyd.edu.au>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page-writeback.c')
| -rw-r--r-- | mm/page-writeback.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 3f0c895c71fe..d374b29296dd 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -241,9 +241,6 @@ static unsigned long global_dirtyable_memory(void) if (!vm_highmem_is_dirtyable) x -= highmem_dirtyable_memory(x); - /* Subtract min_free_kbytes */ - x -= min_t(unsigned long, x, min_free_kbytes >> (PAGE_SHIFT - 10)); - return x + 1; /* Ensure that we never return 0 */ } |
