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

Commit 42962ff0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: vmstat: add pageoutclean"

parents 8423c610 2338a9dc

include/linux/vm_event_item.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 


#define FOR_ALL_ZONES(xx) DMA_ZONE(xx) DMA32_ZONE(xx) xx##_NORMAL HIGHMEM_ZONE(xx) , xx##_MOVABLE



enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,

enum vm_event_item { PGPGIN, PGPGOUT, PGPGOUTCLEAN, PSWPIN, PSWPOUT,

		FOR_ALL_ZONES(PGALLOC),

		PGFREE, PGACTIVATE, PGDEACTIVATE,

		PGFAULT, PGMAJFAULT,

mm/filemap.c

+4 −2
Original line number Diff line number Diff line
@@ -187,10 +187,12 @@ void __delete_from_page_cache(struct page *page, void *shadow) 
	 * invalidate any existing cleancache entries.  We can't leave

	 * stale data around in the cleancache once our page is gone

	 */

	if (PageUptodate(page) && PageMappedToDisk(page))

	if (PageUptodate(page) && PageMappedToDisk(page)) {

		count_vm_event(PGPGOUTCLEAN);

		cleancache_put_page(page);

	else

	} else {

		cleancache_invalidate_page(mapping, page);

	}



	page_cache_tree_delete(mapping, page, shadow);

mm/vmstat.c

+1 −0
Original line number Diff line number Diff line
@@ -806,6 +806,7 @@ const char * const vmstat_text[] = { 
	/* enum vm_event_item counters */

	"pgpgin",

	"pgpgout",

	"pgpgoutclean",

	"pswpin",

	"pswpout",