]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "mm: simplify code of swap.c"
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Jan 2011 22:42:34 +0000 (14:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 Jan 2011 22:42:34 +0000 (14:42 -0800)
commitd891449ca497cdd203d3c2794f1739985fd79f2f
tree422ecdf66c63eebec522b8b59b18616fb3af091d
parent6a9fefc14d5720bf1a8898e7d96d8a4b84be46e6
Revert "mm: simplify code of swap.c"

This reverts commit 87703ec3f0f32a35c409a5d362f97365864b95b3.

Chris Mason ended up chasing down some page allocation errors and pages
stuck waiting on the IO scheduler, and was able to narrow it down to two
commits: commit 805432584733 ("mm: batch activate_page() to reduce lock
contention") and 87703ec3f0f3 ("mm: simplify code of swap.c").

This reverts the second one.

Reported-and-debugged-by: Chris Mason <chris.mason@oracle.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jens Axboe <jaxboe@fusionio.com>
Cc: linux-mm <linux-mm@kvack.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/swap.c