From 4c3a0b4d1e5500444f4e4b2a60b7805c903b66b9 Mon Sep 17 00:00:00 2001 From: KAMEZAWA Hiroyuki Date: Mon, 27 Mar 2006 01:16:01 -0800 Subject: [PATCH] --- yaml --- r: 24311 b: refs/heads/master c: ae0f15fb91274e67d78836d38c99ec363df33073 h: refs/heads/master i: 24309: a513b5c43b34ca7ecedd6f57dc835533bcea94b5 24307: 0f6ae45fa347d044f395c16a9015cb592fef7742 24303: 8efb0e4e98da163d40b989b353b0bb5e51c45ed1 v: v3 --- [refs] | 2 +- trunk/include/linux/mmzone.h | 3 --- trunk/mm/page_alloc.c | 8 ++++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ad910aa82057..34886e64d0d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3571761fe49d960bb720c2308ffb9401f0a5e161 +refs/heads/master: ae0f15fb91274e67d78836d38c99ec363df33073 diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h index 96eb08025092..0d12c3cf1f86 100644 --- a/trunk/include/linux/mmzone.h +++ b/trunk/include/linux/mmzone.h @@ -307,7 +307,6 @@ typedef struct pglist_data { unsigned long node_spanned_pages; /* total size of physical page range, including holes */ int node_id; - struct pglist_data *pgdat_next; wait_queue_head_t kswapd_wait; struct task_struct *kswapd; int kswapd_max_order; @@ -324,8 +323,6 @@ typedef struct pglist_data { #include -extern struct pglist_data *pgdat_list; - void __get_zone_counts(unsigned long *active, unsigned long *inactive, unsigned long *free, struct pglist_data *pgdat); void get_zone_counts(unsigned long *active, unsigned long *inactive, diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index ccc3713dd407..dc523a1f270d 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -49,7 +49,6 @@ nodemask_t node_online_map __read_mostly = { { [0] = 1UL } }; EXPORT_SYMBOL(node_online_map); nodemask_t node_possible_map __read_mostly = NODE_MASK_ALL; EXPORT_SYMBOL(node_possible_map); -struct pglist_data *pgdat_list __read_mostly; unsigned long totalram_pages __read_mostly; unsigned long totalhigh_pages __read_mostly; long nr_swap_pages; @@ -2169,8 +2168,9 @@ static void *frag_start(struct seq_file *m, loff_t *pos) { pg_data_t *pgdat; loff_t node = *pos; - - for (pgdat = pgdat_list; pgdat && node; pgdat = pgdat->pgdat_next) + for (pgdat = first_online_pgdat(); + pgdat && node; + pgdat = next_online_pgdat(pgdat)) --node; return pgdat; @@ -2181,7 +2181,7 @@ static void *frag_next(struct seq_file *m, void *arg, loff_t *pos) pg_data_t *pgdat = (pg_data_t *)arg; (*pos)++; - return pgdat->pgdat_next; + return next_online_pgdat(pgdat); } static void frag_stop(struct seq_file *m, void *arg)