diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-29 14:50:41 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-29 14:50:43 +1000 |
| commit | bf1ef9c39e723865c9cbe53250e195ca2730f3e1 (patch) | |
| tree | 185675fd52490b1f298b10c5ff9add939795f3e5 /mm/vmstat.c | |
| parent | ae6beaeeb6006459cb779637ea41310ff76d7dcb (diff) | |
| parent | db337d977352895b8f234c5cbd52cc81a31894eb (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'mm/vmstat.c')
| -rw-r--r-- | mm/vmstat.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index f42745e65780..7a35116462a7 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -794,7 +794,14 @@ const char * const vmstat_text[] = { "compact_stall", "compact_fail", "compact_success", -#endif + +#ifdef CONFIG_BALLOON_COMPACTION + "compact_balloon_isolated", + "compact_balloon_migrated", + "compact_balloon_returned", +#endif /* CONFIG_BALLOON_COMPACTION */ + +#endif /* CONFIG_COMPACTION */ #ifdef CONFIG_HUGETLB_PAGE "htlb_buddy_alloc_success", |