diff options
| author | Christoph Lameter <clameter@sgi.com> | 2006-09-26 02:31:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:48:46 -0400 |
| commit | c1f60a5a419cc60aff27daffb150f5a3a3a79ef4 (patch) | |
| tree | 8ae176462d6f220cd744ae6c3454113eebda02a8 /mm/page_alloc.c | |
| parent | 182e8e237349e7b6354f45aee4780b6423fd6a50 (diff) | |
[PATCH] reduce MAX_NR_ZONES: move HIGHMEM counters into highmem.c/.h
Move totalhigh_pages and nr_free_highpages() into highmem.c/.h
Move the totalhigh_pages definition into highmem.c/.h. Move the
nr_free_highpages function into highmem.c
[yoichi_yuasa@tripeaks.co.jp: build fix]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e26491cb5a27..5cde54695cfb 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -51,7 +51,6 @@ EXPORT_SYMBOL(node_online_map); | |||
| 51 | nodemask_t node_possible_map __read_mostly = NODE_MASK_ALL; | 51 | nodemask_t node_possible_map __read_mostly = NODE_MASK_ALL; |
| 52 | EXPORT_SYMBOL(node_possible_map); | 52 | EXPORT_SYMBOL(node_possible_map); |
| 53 | unsigned long totalram_pages __read_mostly; | 53 | unsigned long totalram_pages __read_mostly; |
| 54 | unsigned long totalhigh_pages __read_mostly; | ||
| 55 | unsigned long totalreserve_pages __read_mostly; | 54 | unsigned long totalreserve_pages __read_mostly; |
| 56 | long nr_swap_pages; | 55 | long nr_swap_pages; |
| 57 | int percpu_pagelist_fraction; | 56 | int percpu_pagelist_fraction; |
| @@ -1185,20 +1184,6 @@ unsigned int nr_free_pagecache_pages(void) | |||
| 1185 | { | 1184 | { |
| 1186 | return nr_free_zone_pages(gfp_zone(GFP_HIGHUSER)); | 1185 | return nr_free_zone_pages(gfp_zone(GFP_HIGHUSER)); |
| 1187 | } | 1186 | } |
| 1188 | |||
| 1189 | #ifdef CONFIG_HIGHMEM | ||
| 1190 | unsigned int nr_free_highpages (void) | ||
| 1191 | { | ||
| 1192 | pg_data_t *pgdat; | ||
| 1193 | unsigned int pages = 0; | ||
| 1194 | |||
| 1195 | for_each_online_pgdat(pgdat) | ||
| 1196 | pages += pgdat->node_zones[ZONE_HIGHMEM].free_pages; | ||
| 1197 | |||
| 1198 | return pages; | ||
| 1199 | } | ||
| 1200 | #endif | ||
| 1201 | |||
| 1202 | #ifdef CONFIG_NUMA | 1187 | #ifdef CONFIG_NUMA |
| 1203 | static void show_node(struct zone *zone) | 1188 | static void show_node(struct zone *zone) |
| 1204 | { | 1189 | { |
