projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CGroup API files: use cgroup map for memcontrol stats file
[deliverable/linux.git]
/
mm
/
vmstat.c
diff --git
a/mm/vmstat.c
b/mm/vmstat.c
index 422d960ffcd892ae63087b9179354832c14c1f20..ec6035eda933f463ceaa849e8f9f96663a2a025f 100644
(file)
--- a/
mm/vmstat.c
+++ b/
mm/vmstat.c
@@
-322,6
+322,7
@@
void refresh_cpu_vm_stats(int cpu)
p->expire = 3;
#endif
}
p->expire = 3;
#endif
}
+ cond_resched();
#ifdef CONFIG_NUMA
/*
* Deal with draining the remote pageset of this
#ifdef CONFIG_NUMA
/*
* Deal with draining the remote pageset of this
@@
-364,13
+365,13
@@
void refresh_cpu_vm_stats(int cpu)
*
* Must be called with interrupts disabled.
*/
*
* Must be called with interrupts disabled.
*/
-void zone_statistics(struct zone
list *zonelist
, struct zone *z)
+void zone_statistics(struct zone
*preferred_zone
, struct zone *z)
{
{
- if (z->zone_pgdat ==
zonelist->zones[0]
->zone_pgdat) {
+ if (z->zone_pgdat ==
preferred_zone
->zone_pgdat) {
__inc_zone_state(z, NUMA_HIT);
} else {
__inc_zone_state(z, NUMA_MISS);
__inc_zone_state(z, NUMA_HIT);
} else {
__inc_zone_state(z, NUMA_MISS);
- __inc_zone_state(
zonelist->zones[0]
, NUMA_FOREIGN);
+ __inc_zone_state(
preferred_zone
, NUMA_FOREIGN);
}
if (z->node == numa_node_id())
__inc_zone_state(z, NUMA_LOCAL);
}
if (z->node == numa_node_id())
__inc_zone_state(z, NUMA_LOCAL);
@@
-388,6
+389,7
@@
static char * const migratetype_names[MIGRATE_TYPES] = {
"Reclaimable",
"Movable",
"Reserve",
"Reclaimable",
"Movable",
"Reserve",
+ "Isolate",
};
static void *frag_start(struct seq_file *m, loff_t *pos)
};
static void *frag_start(struct seq_file *m, loff_t *pos)
@@
-644,6
+646,10
@@
static const char * const vmstat_text[] = {
"allocstall",
"pgrotated",
"allocstall",
"pgrotated",
+#ifdef CONFIG_HUGETLB_PAGE
+ "htlb_buddy_alloc_success",
+ "htlb_buddy_alloc_fail",
+#endif
#endif
};
#endif
};
This page took
0.038562 seconds
and
5
git commands to generate.