Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 31372
b: refs/heads/master
c: 65ba55f
h: refs/heads/master
v: v3
  • Loading branch information
Christoph Lameter authored and Linus Torvalds committed Jun 30, 2006
1 parent 40803ae commit 6d150af
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2244b95a7bcf8d24196f8a3a44187ba5dfff754c
refs/heads/master: 65ba55f500a37272985d071c9bbb35256a2f7c14
2 changes: 1 addition & 1 deletion trunk/arch/i386/mm/pgtable.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ void show_mem(void)
get_page_state(&ps);
printk(KERN_INFO "%lu pages dirty\n", ps.nr_dirty);
printk(KERN_INFO "%lu pages writeback\n", ps.nr_writeback);
printk(KERN_INFO "%lu pages mapped\n", ps.nr_mapped);
printk(KERN_INFO "%lu pages mapped\n", global_page_state(NR_FILE_MAPPED));
printk(KERN_INFO "%lu pages slab\n", ps.nr_slab);
printk(KERN_INFO "%lu pages pagetables\n", ps.nr_page_table_pages);
}
Expand Down
4 changes: 1 addition & 3 deletions trunk/drivers/base/node.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
ps.nr_dirty = 0;
if ((long)ps.nr_writeback < 0)
ps.nr_writeback = 0;
if ((long)ps.nr_mapped < 0)
ps.nr_mapped = 0;
if ((long)ps.nr_slab < 0)
ps.nr_slab = 0;

Expand Down Expand Up @@ -84,7 +82,7 @@ static ssize_t node_read_meminfo(struct sys_device * dev, char * buf)
nid, K(i.freeram - i.freehigh),
nid, K(ps.nr_dirty),
nid, K(ps.nr_writeback),
nid, K(ps.nr_mapped),
nid, K(node_page_state(nid, NR_FILE_MAPPED)),
nid, K(ps.nr_slab));
n += hugetlb_report_node_meminfo(nid, buf + n);
return n;
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/proc/proc_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
K(i.freeswap),
K(ps.nr_dirty),
K(ps.nr_writeback),
K(ps.nr_mapped),
K(global_page_state(NR_FILE_MAPPED)),
K(ps.nr_slab),
K(allowed),
K(committed),
Expand Down
3 changes: 3 additions & 0 deletions trunk/include/linux/mmzone.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ struct zone_padding {
#endif

enum zone_stat_item {
NR_FILE_MAPPED, /* mapped into pagetables.
only modified from process context */

NR_VM_ZONE_STAT_ITEMS };

struct per_cpu_pages {
Expand Down
2 changes: 0 additions & 2 deletions trunk/include/linux/vmstat.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ struct page_state {
unsigned long nr_writeback; /* Pages under writeback */
unsigned long nr_unstable; /* NFS unstable pages */
unsigned long nr_page_table_pages;/* Pages used for pagetables */
unsigned long nr_mapped; /* mapped into pagetables.
* only modified from process context */
unsigned long nr_slab; /* In slab */
#define GET_PAGE_STATE_LAST nr_slab

Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/page-writeback.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ static void get_writeback_state(struct writeback_state *wbs)
{
wbs->nr_dirty = read_page_state(nr_dirty);
wbs->nr_unstable = read_page_state(nr_unstable);
wbs->nr_mapped = read_page_state(nr_mapped);
wbs->nr_mapped = global_page_state(NR_FILE_MAPPED);
wbs->nr_writeback = read_page_state(nr_writeback);
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1319,7 +1319,7 @@ void show_free_areas(void)
ps.nr_unstable,
nr_free_pages(),
ps.nr_slab,
ps.nr_mapped,
global_page_state(NR_FILE_MAPPED),
ps.nr_page_table_pages);

for_each_zone(zone) {
Expand Down
6 changes: 3 additions & 3 deletions trunk/mm/rmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ static void __page_set_anon_rmap(struct page *page,
* nr_mapped state can be updated without turning off
* interrupts because it is not modified via interrupt.
*/
__inc_page_state(nr_mapped);
__inc_zone_page_state(page, NR_FILE_MAPPED);
}

/**
Expand Down Expand Up @@ -499,7 +499,7 @@ void page_add_new_anon_rmap(struct page *page,
void page_add_file_rmap(struct page *page)
{
if (atomic_inc_and_test(&page->_mapcount))
__inc_page_state(nr_mapped);
__inc_zone_page_state(page, NR_FILE_MAPPED);
}

/**
Expand Down Expand Up @@ -531,7 +531,7 @@ void page_remove_rmap(struct page *page)
*/
if (page_test_and_clear_dirty(page))
set_page_dirty(page);
__dec_page_state(nr_mapped);
__dec_zone_page_state(page, NR_FILE_MAPPED);
}
}

Expand Down
8 changes: 4 additions & 4 deletions trunk/mm/vmscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ unsigned long try_to_free_pages(struct zone **zones, gfp_t gfp_mask)
}

for (priority = DEF_PRIORITY; priority >= 0; priority--) {
sc.nr_mapped = read_page_state(nr_mapped);
sc.nr_mapped = global_page_state(NR_FILE_MAPPED);
sc.nr_scanned = 0;
if (!priority)
disable_swap_token();
Expand Down Expand Up @@ -1075,7 +1075,7 @@ static unsigned long balance_pgdat(pg_data_t *pgdat, int order)
total_scanned = 0;
nr_reclaimed = 0;
sc.may_writepage = !laptop_mode;
sc.nr_mapped = read_page_state(nr_mapped);
sc.nr_mapped = global_page_state(NR_FILE_MAPPED);

inc_page_state(pageoutrun);

Expand Down Expand Up @@ -1407,7 +1407,7 @@ unsigned long shrink_all_memory(unsigned long nr_pages)
for (prio = DEF_PRIORITY; prio >= 0; prio--) {
unsigned long nr_to_scan = nr_pages - ret;

sc.nr_mapped = read_page_state(nr_mapped);
sc.nr_mapped = global_page_state(NR_FILE_MAPPED);
sc.nr_scanned = 0;

ret += shrink_all_zones(nr_to_scan, prio, pass, &sc);
Expand Down Expand Up @@ -1548,7 +1548,7 @@ static int __zone_reclaim(struct zone *zone, gfp_t gfp_mask, unsigned int order)
struct scan_control sc = {
.may_writepage = !!(zone_reclaim_mode & RECLAIM_WRITE),
.may_swap = !!(zone_reclaim_mode & RECLAIM_SWAP),
.nr_mapped = read_page_state(nr_mapped),
.nr_mapped = global_page_state(NR_FILE_MAPPED),
.swap_cluster_max = max_t(unsigned long, nr_pages,
SWAP_CLUSTER_MAX),
.gfp_mask = gfp_mask,
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/vmstat.c
Original file line number Diff line number Diff line change
Expand Up @@ -401,13 +401,13 @@ struct seq_operations fragmentation_op = {

static char *vmstat_text[] = {
/* Zoned VM counters */
"nr_mapped",

/* Page state */
"nr_dirty",
"nr_writeback",
"nr_unstable",
"nr_page_table_pages",
"nr_mapped",
"nr_slab",

"pgpgin",
Expand Down

0 comments on commit 6d150af

Please sign in to comment.