From e465e580f41351951ee2fd99a421d515154a146d Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Sat, 10 Feb 2007 01:43:04 -0800 Subject: [PATCH] --- yaml --- r: 47405 b: refs/heads/master c: 9195481d2f869a2707a272057f3f8664fd277534 h: refs/heads/master i: 47403: aabfa7396086d5de964e580fc7ff44034a0f81c0 v: v3 --- [refs] | 2 +- trunk/arch/ia64/mm/init.c | 2 +- trunk/include/linux/swap.h | 1 - trunk/mm/page_alloc.c | 7 ------- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 50ae14aa2440..487f4101cdd0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96177299416dbccb73b54e6b344260154a445375 +refs/heads/master: 9195481d2f869a2707a272057f3f8664fd277534 diff --git a/trunk/arch/ia64/mm/init.c b/trunk/arch/ia64/mm/init.c index faaca21a3718..760dda4d5b6e 100644 --- a/trunk/arch/ia64/mm/init.c +++ b/trunk/arch/ia64/mm/init.c @@ -68,7 +68,7 @@ max_pgt_pages(void) #ifndef CONFIG_NUMA node_free_pages = nr_free_pages(); #else - node_free_pages = nr_free_pages_pgdat(NODE_DATA(numa_node_id())); + node_free_pages = node_page_state(numa_node_id(), NR_FREE_PAGES); #endif max_pgt_pages = node_free_pages / PGT_FRACTION_OF_NODE_MEM; max_pgt_pages = max(max_pgt_pages, MIN_PGT_PAGES); diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h index 817e1b47007f..006868881346 100644 --- a/trunk/include/linux/swap.h +++ b/trunk/include/linux/swap.h @@ -170,7 +170,6 @@ extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct * extern unsigned long totalram_pages; extern unsigned long totalreserve_pages; extern long nr_swap_pages; -extern unsigned int nr_free_pages_pgdat(pg_data_t *pgdat); extern unsigned int nr_free_buffer_pages(void); extern unsigned int nr_free_pagecache_pages(void); diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index f1e320b3a988..cf1a34074f08 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1440,13 +1440,6 @@ fastcall void free_pages(unsigned long addr, unsigned int order) EXPORT_SYMBOL(free_pages); -#ifdef CONFIG_NUMA -unsigned int nr_free_pages_pgdat(pg_data_t *pgdat) -{ - return node_page_state(pgdat->node_id, NR_FREE_PAGES); -} -#endif - static unsigned int nr_free_zone_pages(int offset) { /* Just pick one node, since fallback list is circular */