diff options
-rw-r--r-- | arch/ia64/mm/init.c | 2 | ||||
-rw-r--r-- | include/linux/swap.h | 1 | ||||
-rw-r--r-- | mm/page_alloc.c | 7 |
3 files changed, 1 insertions, 9 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index faaca21a3718..760dda4d5b6e 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -68,7 +68,7 @@ max_pgt_pages(void) | |||
68 | #ifndef CONFIG_NUMA | 68 | #ifndef CONFIG_NUMA |
69 | node_free_pages = nr_free_pages(); | 69 | node_free_pages = nr_free_pages(); |
70 | #else | 70 | #else |
71 | node_free_pages = nr_free_pages_pgdat(NODE_DATA(numa_node_id())); | 71 | node_free_pages = node_page_state(numa_node_id(), NR_FREE_PAGES); |
72 | #endif | 72 | #endif |
73 | max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM; | 73 | max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM; |
74 | max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES); | 74 | max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES); |
diff --git a/include/linux/swap.h b/include/linux/swap.h index 817e1b47007f..006868881346 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -170,7 +170,6 @@ extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct * | |||
170 | extern unsigned long totalram_pages; | 170 | extern unsigned long totalram_pages; |
171 | extern unsigned long totalreserve_pages; | 171 | extern unsigned long totalreserve_pages; |
172 | extern long nr_swap_pages; | 172 | extern long nr_swap_pages; |
173 | extern unsigned int nr_free_pages_pgdat(pg_data_t *pgdat); | ||
174 | extern unsigned int nr_free_buffer_pages(void); | 173 | extern unsigned int nr_free_buffer_pages(void); |
175 | extern unsigned int nr_free_pagecache_pages(void); | 174 | extern unsigned int nr_free_pagecache_pages(void); |
176 | 175 | ||
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index f1e320b3a988..cf1a34074f08 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1440,13 +1440,6 @@ fastcall void free_pages(unsigned long addr, unsigned int order) | |||
1440 | 1440 | ||
1441 | EXPORT_SYMBOL(free_pages); | 1441 | EXPORT_SYMBOL(free_pages); |
1442 | 1442 | ||
1443 | #ifdef CONFIG_NUMA | ||
1444 | unsigned int nr_free_pages_pgdat(pg_data_t *pgdat) | ||
1445 | { | ||
1446 | return node_page_state(pgdat->node_id, NR_FREE_PAGES); | ||
1447 | } | ||
1448 | #endif | ||
1449 | |||
1450 | static unsigned int nr_free_zone_pages(int offset) | 1443 | static unsigned int nr_free_zone_pages(int offset) |
1451 | { | 1444 | { |
1452 | /* Just pick one node, since fallback list is circular */ | 1445 | /* Just pick one node, since fallback list is circular */ |