Merge "mm/migration: make isolate_movable_page() return int type" (bc60923a) · Commits · e / devices / android_kernel_sony_msm8998

include/linux/migrate.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ extern int migrate_page(struct address_space *,
		struct page , struct page , enum migrate_mode);
		extern int migrate_pages(struct list_head *l, new_page_t new, free_page_t free,
		unsigned long private, enum migrate_mode mode, int reason);
		extern bool isolate_movable_page(struct page *page, isolate_mode_t mode);
		extern int isolate_movable_page(struct page *page, isolate_mode_t mode);
		extern void putback_movable_page(struct page *page);

		extern int migrate_prep(void);

+1 −1

Original line number	Diff line number	Diff line
		@@ -853,7 +853,7 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
		locked = false;
		}

		if (isolate_movable_page(page, isolate_mode))
		if (!isolate_movable_page(page, isolate_mode))
		goto isolate_success;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ int migrate_prep_local(void)
		return 0;
		}

		bool isolate_movable_page(struct page *page, isolate_mode_t mode)
		int isolate_movable_page(struct page *page, isolate_mode_t mode)
		{
		struct address_space *mapping;

		@@ -126,14 +126,14 @@ bool isolate_movable_page(struct page *page, isolate_mode_t mode)
		__SetPageIsolated(page);
		unlock_page(page);

		return true;
		return 0;

		out_no_isolated:
		unlock_page(page);
		out_putpage:
		put_page(page);
		out:
		return false;
		return -EBUSY;
		}

		/* It should be called on page which is PG_movable */