From 4d80128514c869777a33d7d2b8a882680d76a29b Mon Sep 17 00:00:00 2001 From: Hugh Dickins Date: Mon, 8 Oct 2012 16:33:42 -0700 Subject: [PATCH] --- yaml --- r: 332465 b: refs/heads/master c: 8befedfe678ff84d5bc356be4f3cb1fd84959d02 h: refs/heads/master i: 332463: f021cc1e94c74ae8b0d02b319640b106b9b911f9 v: v3 --- [refs] | 2 +- trunk/include/linux/vm_event_item.h | 1 - trunk/mm/vmstat.c | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae5945286234..0c2e68ea0a09 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a883813845a2bb5ed2bd8c9240736c0740b156f +refs/heads/master: 8befedfe678ff84d5bc356be4f3cb1fd84959d02 diff --git a/trunk/include/linux/vm_event_item.h b/trunk/include/linux/vm_event_item.h index ede4ddd46695..3d3114594370 100644 --- a/trunk/include/linux/vm_event_item.h +++ b/trunk/include/linux/vm_event_item.h @@ -52,7 +52,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, UNEVICTABLE_PGMUNLOCKED, UNEVICTABLE_PGCLEARED, /* on COW, page truncate */ UNEVICTABLE_PGSTRANDED, /* unable to isolate on unlock */ - UNEVICTABLE_MLOCKFREED, /* no longer useful: always zero */ #ifdef CONFIG_TRANSPARENT_HUGEPAGE THP_FAULT_ALLOC, THP_FAULT_FALLBACK, diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c index 2f11309955cc..c7370579111b 100644 --- a/trunk/mm/vmstat.c +++ b/trunk/mm/vmstat.c @@ -794,7 +794,6 @@ const char * const vmstat_text[] = { "unevictable_pgs_munlocked", "unevictable_pgs_cleared", "unevictable_pgs_stranded", - "unevictable_pgs_mlockfreed", /* no longer useful: always zero */ #ifdef CONFIG_TRANSPARENT_HUGEPAGE "thp_fault_alloc",