File tree Expand file tree Collapse file tree 2 files changed +7
-14
lines changed Expand file tree Collapse file tree 2 files changed +7
-14
lines changed Original file line number Diff line number Diff line change @@ -34,10 +34,11 @@ struct reclaim_stat {
34
34
unsigned nr_lazyfree_fail ;
35
35
};
36
36
37
- enum writeback_stat_item {
37
+ /* Stat data for system wide items */
38
+ enum vm_stat_item {
38
39
NR_DIRTY_THRESHOLD ,
39
40
NR_DIRTY_BG_THRESHOLD ,
40
- NR_VM_WRITEBACK_STAT_ITEMS ,
41
+ NR_VM_STAT_ITEMS ,
41
42
};
42
43
43
44
#ifdef CONFIG_VM_EVENT_COUNTERS
@@ -514,21 +515,13 @@ static inline const char *lru_list_name(enum lru_list lru)
514
515
return node_stat_name (NR_LRU_BASE + lru ) + 3 ; // skip "nr_"
515
516
}
516
517
517
- static inline const char * writeback_stat_name (enum writeback_stat_item item )
518
- {
519
- return vmstat_text [NR_VM_ZONE_STAT_ITEMS +
520
- NR_VM_NUMA_EVENT_ITEMS +
521
- NR_VM_NODE_STAT_ITEMS +
522
- item ];
523
- }
524
-
525
518
#if defined(CONFIG_VM_EVENT_COUNTERS ) || defined(CONFIG_MEMCG )
526
519
static inline const char * vm_event_name (enum vm_event_item item )
527
520
{
528
521
return vmstat_text [NR_VM_ZONE_STAT_ITEMS +
529
522
NR_VM_NUMA_EVENT_ITEMS +
530
523
NR_VM_NODE_STAT_ITEMS +
531
- NR_VM_WRITEBACK_STAT_ITEMS +
524
+ NR_VM_STAT_ITEMS +
532
525
item ];
533
526
}
534
527
#endif /* CONFIG_VM_EVENT_COUNTERS || CONFIG_MEMCG */
Original file line number Diff line number Diff line change @@ -1257,7 +1257,7 @@ const char * const vmstat_text[] = {
1257
1257
"pgdemote_khugepaged" ,
1258
1258
"nr_memmap" ,
1259
1259
"nr_memmap_boot" ,
1260
- /* enum writeback_stat_item counters */
1260
+ /* system-wide enum vm_stat_item counters */
1261
1261
"nr_dirty_threshold" ,
1262
1262
"nr_dirty_background_threshold" ,
1263
1263
@@ -1790,7 +1790,7 @@ static const struct seq_operations zoneinfo_op = {
1790
1790
#define NR_VMSTAT_ITEMS (NR_VM_ZONE_STAT_ITEMS + \
1791
1791
NR_VM_NUMA_EVENT_ITEMS + \
1792
1792
NR_VM_NODE_STAT_ITEMS + \
1793
- NR_VM_WRITEBACK_STAT_ITEMS + \
1793
+ NR_VM_STAT_ITEMS + \
1794
1794
(IS_ENABLED(CONFIG_VM_EVENT_COUNTERS) ? \
1795
1795
NR_VM_EVENT_ITEMS : 0))
1796
1796
@@ -1827,7 +1827,7 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
1827
1827
1828
1828
global_dirty_limits (v + NR_DIRTY_BG_THRESHOLD ,
1829
1829
v + NR_DIRTY_THRESHOLD );
1830
- v += NR_VM_WRITEBACK_STAT_ITEMS ;
1830
+ v += NR_VM_STAT_ITEMS ;
1831
1831
1832
1832
#ifdef CONFIG_VM_EVENT_COUNTERS
1833
1833
all_vm_events (v );
You can’t perform that action at this time.
0 commit comments