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

Commit 20a1022d authored by Balbir Singh's avatar Balbir Singh Committed by Linus Torvalds
Browse files

Swap delay accounting, include lock_page() delays 



The delay incurred in lock_page() should also be accounted in swap delay
accounting

Reported-by: default avatarNick Piggin <nickpiggin@yahoo.com.au>
Signed-off-by: default avatarBalbir Singh <balbir@linux.vnet.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9c8d6381

mm/memory.c

+1 −1
Original line number Diff line number Diff line
@@ -2084,9 +2084,9 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, 
		count_vm_event(PGMAJFAULT);

	}



	delayacct_clear_flag(DELAYACCT_PF_SWAPIN);

	mark_page_accessed(page);

	lock_page(page);

	delayacct_clear_flag(DELAYACCT_PF_SWAPIN);



	/*

	 * Back out if somebody else already faulted in this pte.