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

Commit fb8e4568 authored by Peter Xu's avatar Peter Xu Committed by Todd Kjos
Browse files

UPSTREAM: mm/ksm: Remove reuse_ksm_page() 



Remove the function as the last reference has gone away with the do_wp_page()
changes.

Signed-off-by: default avatarPeter Xu <peterx@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 1a0cf26323c80e2f1c58fc04f15686de61bfab0c)

Bug: 176847924
Signed-off-by: default avatarKalesh Singh <kaleshsingh@google.com>
Change-Id: I70e5938a046d0fc449288ae46c83cb7c39d7de48
parent 2ddac378

include/linux/ksm.h

+0 −7
Original line number Diff line number Diff line
@@ -53,8 +53,6 @@ struct page *ksm_might_need_to_copy(struct page *page, 


void rmap_walk_ksm(struct page *page, struct rmap_walk_control *rwc);

void ksm_migrate_page(struct page *newpage, struct page *oldpage);

bool reuse_ksm_page(struct page *page,

			struct vm_area_struct *vma, unsigned long address);



#else  /* !CONFIG_KSM */
@@ -88,11 +86,6 @@ static inline void rmap_walk_ksm(struct page *page, 
static inline void ksm_migrate_page(struct page *newpage, struct page *oldpage)

{

}

static inline bool reuse_ksm_page(struct page *page,

			struct vm_area_struct *vma, unsigned long address)

{

	return false;

}

#endif /* CONFIG_MMU */

#endif /* !CONFIG_KSM */

mm/ksm.c

+0 −25
Original line number Diff line number Diff line
@@ -2660,31 +2660,6 @@ void rmap_walk_ksm(struct page *page, struct rmap_walk_control *rwc) 
		goto again;

}



bool reuse_ksm_page(struct page *page,

		    struct vm_area_struct *vma,

		    unsigned long address)

{

#ifdef CONFIG_DEBUG_VM

	if (WARN_ON(is_zero_pfn(page_to_pfn(page))) ||

			WARN_ON(!page_mapped(page)) ||

			WARN_ON(!PageLocked(page))) {

		dump_page(page, "reuse_ksm_page");

		return false;

	}

#endif



	if (PageSwapCache(page) || !page_stable_node(page))

		return false;

	/* Prohibit parallel get_ksm_page() */

	if (!page_ref_freeze(page, 1))

		return false;



	page_move_anon_rmap(page, vma);

	page->index = linear_page_index(vma, address);

	page_ref_unfreeze(page, 1);



	return true;

}

#ifdef CONFIG_MIGRATION

void ksm_migrate_page(struct page *newpage, struct page *oldpage)

{