]> git.baikalelectronics.ru Git - kernel.git/commit
mm: cma: remove watermark hacks
authorMarek Szyprowski <m.szyprowski@samsung.com>
Wed, 12 Dec 2012 00:02:59 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 12 Dec 2012 01:22:27 +0000 (17:22 -0800)
commit02048f1cb059ac0e07be93e228a4634f59e5385e
treeb67904e354a30c9ecc0a53b8288a3a74c37b9bc2
parent026e54baa0d54c1ae6f6481bdf731cb401058b4f
mm: cma: remove watermark hacks

Commits 4e7439756d86 ("cma: fix counting of isolated pages") and
0888dece8c98 ("cma: fix watermark checking") introduced a reliable
method of free page accounting when memory is being allocated from CMA
regions, so the workaround introduced earlier by commit 3e0bdf23c271
("mm: trigger page reclaim in alloc_contig_range() to stabilise
watermarks") can be finally removed.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Mel Gorman <mel@csn.ul.ie>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/mmzone.h
mm/page_alloc.c