projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[linux-2.6-block.git]
/
include
/
linux
/
vm_event_item.h
diff --git
a/include/linux/vm_event_item.h
b/include/linux/vm_event_item.h
index 57f7b1091511b3103e9850c893a7fe7fb7a37f3a..3d3114594370118addc16ee1156e9b19f6d97fef 100644
(file)
--- a/
include/linux/vm_event_item.h
+++ b/
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,
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
THP_FAULT_ALLOC,
THP_FAULT_FALLBACK,