diff options
author | Andrew Morton <akpm@osdl.org> | 2007-02-10 04:42:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:17 -0500 |
commit | 5a88a13d0624769088ae220e40c2f542f1661eb3 (patch) | |
tree | b1ab0b3d384411d9bf29d1dcd5ed8d527f208aab /mm | |
parent | a6af2bc3d5ce8722b9d09c5bdd5383c91c419653 (diff) |
[PATCH] /proc/zoneinfo: fix vm stats display
This early break prevents us from displaying info for the vm stats thresholds
if the zone doesn't have any pages in its per-cpu pagesets.
So my 800MB i386 box says:
Node 0, zone DMA
pages free 2365
min 16
low 20
high 24
active 0
inactive 0
scanned 0 (a: 0 i: 0)
spanned 4096
present 4044
nr_anon_pages 0
nr_mapped 1
nr_file_pages 0
nr_slab_reclaimable 0
nr_slab_unreclaimable 0
nr_page_table_pages 0
nr_dirty 0
nr_writeback 0
nr_unstable 0
nr_bounce 0
nr_vmscan_write 0
protection: (0, 868, 868)
pagesets
all_unreclaimable: 0
prev_priority: 12
start_pfn: 0
Node 0, zone Normal
pages free 199713
min 934
low 1167
high 1401
active 10215
inactive 4507
scanned 0 (a: 0 i: 0)
spanned 225280
present 222420
nr_anon_pages 2685
nr_mapped 1110
nr_file_pages 12055
nr_slab_reclaimable 2216
nr_slab_unreclaimable 1527
nr_page_table_pages 213
nr_dirty 0
nr_writeback 0
nr_unstable 0
nr_bounce 0
nr_vmscan_write 0
protection: (0, 0, 0)
pagesets
cpu: 0 pcp: 0
count: 152
high: 186
batch: 31
cpu: 0 pcp: 1
count: 13
high: 62
batch: 15
vm stats threshold: 16
cpu: 1 pcp: 0
count: 34
high: 186
batch: 31
cpu: 1 pcp: 1
count: 10
high: 62
batch: 15
vm stats threshold: 16
all_unreclaimable: 0
prev_priority: 12
start_pfn: 4096
Just nuke all that search-for-the-first-non-empty-pageset code. Dunno why it
was there in the first place..
Cc: Christoph Lameter <clameter@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/vmstat.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index dc005a0c96ae..bf62a8232100 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c | |||
@@ -563,12 +563,6 @@ static int zoneinfo_show(struct seq_file *m, void *arg) | |||
563 | 563 | ||
564 | pageset = zone_pcp(zone, i); | 564 | pageset = zone_pcp(zone, i); |
565 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { | 565 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { |
566 | if (pageset->pcp[j].count) | ||
567 | break; | ||
568 | } | ||
569 | if (j == ARRAY_SIZE(pageset->pcp)) | ||
570 | continue; | ||
571 | for (j = 0; j < ARRAY_SIZE(pageset->pcp); j++) { | ||
572 | seq_printf(m, | 566 | seq_printf(m, |
573 | "\n cpu: %i pcp: %i" | 567 | "\n cpu: %i pcp: %i" |
574 | "\n count: %i" | 568 | "\n count: %i" |