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
libceph: move r_reply_op_{len,result} into struct ceph_osd_req_op
[linux-2.6-block.git]
/
mm
/
vmstat.c
diff --git
a/mm/vmstat.c
b/mm/vmstat.c
index 084c6725b3734430483e7ea4fcf74e2ab67f7bfa..5e43004828971e778a185ec69f2ef9710f085fb4 100644
(file)
--- a/
mm/vmstat.c
+++ b/
mm/vmstat.c
@@
-826,6
+826,7
@@
const char * const vmstat_text[] = {
"compact_stall",
"compact_fail",
"compact_success",
"compact_stall",
"compact_fail",
"compact_success",
+ "compact_daemon_wake",
#endif
#ifdef CONFIG_HUGETLB_PAGE
#endif
#ifdef CONFIG_HUGETLB_PAGE
@@
-847,6
+848,7
@@
const char * const vmstat_text[] = {
"thp_collapse_alloc_failed",
"thp_split_page",
"thp_split_page_failed",
"thp_collapse_alloc_failed",
"thp_split_page",
"thp_split_page_failed",
+ "thp_deferred_split_page",
"thp_split_pmd",
"thp_zero_page_alloc",
"thp_zero_page_alloc_failed",
"thp_split_pmd",
"thp_zero_page_alloc",
"thp_zero_page_alloc_failed",
@@
-924,19
+926,6
@@
static void walk_zones_in_node(struct seq_file *m, pg_data_t *pgdat,
#endif
#ifdef CONFIG_PROC_FS
#endif
#ifdef CONFIG_PROC_FS
-static char * const migratetype_names[MIGRATE_TYPES] = {
- "Unmovable",
- "Movable",
- "Reclaimable",
- "HighAtomic",
-#ifdef CONFIG_CMA
- "CMA",
-#endif
-#ifdef CONFIG_MEMORY_ISOLATION
- "Isolate",
-#endif
-};
-
static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
struct zone *zone)
{
static void frag_show_print(struct seq_file *m, pg_data_t *pgdat,
struct zone *zone)
{
@@
-1133,7
+1122,7
@@
static void pagetypeinfo_showmixedcount(struct seq_file *m, pg_data_t *pgdat)
#ifdef CONFIG_PAGE_OWNER
int mtype;
#ifdef CONFIG_PAGE_OWNER
int mtype;
- if (!
page_owner_inited
)
+ if (!
static_branch_unlikely(&page_owner_inited)
)
return;
drain_all_pages(NULL);
return;
drain_all_pages(NULL);