Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d9c285a authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

mm: move inc_zone_page_state(NR_ISOLATED) to just isolated place 



Christoph pointed out inc_zone_page_state(NR_ISOLATED) should be placed
in right after isolate_page().

This patch does it.

Reviewed-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee32398f

mm/memory_hotplug.c

+4 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/page-isolation.h>

#include <linux/pfn.h>

#include <linux/suspend.h>

#include <linux/mm_inline.h>



#include <asm/tlbflush.h>
@@ -672,6 +673,9 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) 
		if (!ret) { /* Success */

			list_add_tail(&page->lru, &source);

			move_pages--;

			inc_zone_page_state(page, NR_ISOLATED_ANON +

					    page_is_file_cache(page));



		} else {

			/* Becasue we don't have big zone->lock. we should

			   check this again here. */

mm/mempolicy.c

+3 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ 
#include <linux/security.h>

#include <linux/syscalls.h>

#include <linux/ctype.h>

#include <linux/mm_inline.h>



#include <asm/tlbflush.h>

#include <asm/uaccess.h>
@@ -809,6 +810,8 @@ static void migrate_page_add(struct page *page, struct list_head *pagelist, 
	if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1) {

		if (!isolate_lru_page(page)) {

			list_add_tail(&page->lru, pagelist);

			inc_zone_page_state(page, NR_ISOLATED_ANON +

					    page_is_file_cache(page));

		}

	}

}

mm/migrate.c

+4 −8
Original line number Diff line number Diff line
@@ -746,13 +746,6 @@ int migrate_pages(struct list_head *from, 
	struct page *page2;

	int swapwrite = current->flags & PF_SWAPWRITE;

	int rc;

	unsigned long flags;



	local_irq_save(flags);

	list_for_each_entry(page, from, lru)

		__inc_zone_page_state(page, NR_ISOLATED_ANON +

				page_is_file_cache(page));

	local_irq_restore(flags);



	if (!swapwrite)

		current->flags |= PF_SWAPWRITE;
@@ -878,8 +871,11 @@ static int do_move_page_to_node_array(struct mm_struct *mm, 
			goto put_and_set;



		err = isolate_lru_page(page);

		if (!err)

		if (!err) {

			list_add_tail(&page->lru, &pagelist);

			inc_zone_page_state(page, NR_ISOLATED_ANON +

					    page_is_file_cache(page));

		}

put_and_set:

		/*

		 * Either remove the duplicate refcount from