Unverified Commit d3adf204 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4170 mm/ksm: generalize ksm_process_profit 

Merge Pull Request from: @ci-robot 
 
PR sync from: Nanyong Sun <sunnanyong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/IPBJWA53SRNP4E4BWFT76FHCTXHEOQZY/ 
 
https://gitee.com/openeuler/kernel/issues/I8YMGX 
 
Link:https://gitee.com/openeuler/kernel/pulls/4170

 

Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parents e076c150 4634ef55

include/linux/ksm.h

+0 −2
Original line number Diff line number Diff line
@@ -87,9 +87,7 @@ void collect_procs_ksm(struct page *page, struct list_head *to_kill, 
		       int force_early);

#endif



#ifdef CONFIG_PROC_FS

long ksm_process_profit(struct mm_struct *);

#endif /* CONFIG_PROC_FS */



#else  /* !CONFIG_KSM */

mm/ksm.c

+0 −2
Original line number Diff line number Diff line
@@ -3106,13 +3106,11 @@ static void wait_while_offlining(void) 
}

#endif /* CONFIG_MEMORY_HOTREMOVE */



#ifdef CONFIG_PROC_FS

long ksm_process_profit(struct mm_struct *mm)

{

	return (long)(mm->ksm_merging_pages + mm->ksm_zero_pages) * PAGE_SIZE -

		mm->ksm_rmap_items * sizeof(struct ksm_rmap_item);

}

#endif /* CONFIG_PROC_FS */



#ifdef CONFIG_SYSFS

/*