From aabfa7396086d5de964e580fc7ff44034a0f81c0 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sat, 10 Feb 2007 01:43:02 -0800 Subject: [PATCH] --- yaml --- r: 47403 b: refs/heads/master c: 51ed4491271be8c56bdb2a03481ed34ea4984bc2 h: refs/heads/master i: 47401: 2a3b055e5c5dbfec62f595d4944416d93641e389 47399: 4cbd08835af7f3e30a298f167419ed849daf4bdc v: v3 --- [refs] | 2 +- trunk/include/linux/mmzone.h | 8 +++++--- trunk/mm/vmstat.c | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 1826a6c8aec9..3780cd647f30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d23ad42324cc4378132e51f2fc5c9ba6cbe75182 +refs/heads/master: 51ed4491271be8c56bdb2a03481ed34ea4984bc2 diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 824279c7884d..d15b1f68aef9 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -47,6 +47,7 @@ struct zone_padding { #endif enum zone_stat_item { + /* First 128 byte cacheline (assuming 64 bit words) */ NR_FREE_PAGES, NR_INACTIVE, NR_ACTIVE, @@ -54,11 +55,12 @@ enum zone_stat_item { NR_FILE_MAPPED, /* pagecache pages mapped into pagetables. only modified from process context */ NR_FILE_PAGES, - NR_SLAB_RECLAIMABLE, - NR_SLAB_UNRECLAIMABLE, - NR_PAGETABLE, /* used for pagetables */ NR_FILE_DIRTY, NR_WRITEBACK, + /* Second 128 byte cacheline */ + NR_SLAB_RECLAIMABLE, + NR_SLAB_UNRECLAIMABLE, + NR_PAGETABLE, /* used for pagetables */ NR_UNSTABLE_NFS, /* NFS unstable pages */ NR_BOUNCE, NR_VMSCAN_WRITE, diff --git a/trunk/mm/vmstat.c b/trunk/mm/vmstat.c index 2386716f1754..2ee7ec5e003f 100644 --- a/trunk/mm/vmstat.c +++ b/trunk/mm/vmstat.c @@ -447,11 +447,11 @@ static const char * const vmstat_text[] = { "nr_anon_pages", "nr_mapped", "nr_file_pages", + "nr_dirty", + "nr_writeback", "nr_slab_reclaimable", "nr_slab_unreclaimable", "nr_page_table_pages", - "nr_dirty", - "nr_writeback", "nr_unstable", "nr_bounce", "nr_vmscan_write",