From: Christoph Lameter nr_free_pages is now a simple access to a global variable. Make it a macro instead of a function. The nr_free_pages now requires vmstat.h to be included. There is one occurrence in power management where we need to add the include. Directly refrer to global_page_state() there to clarify why the #include was added. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton --- include/linux/swap.h | 5 ++++- kernel/power/main.c | 4 +++- mm/page_alloc.c | 10 ---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff -puN include/linux/swap.h~drop-free_pages include/linux/swap.h --- a/include/linux/swap.h~drop-free_pages +++ a/include/linux/swap.h @@ -170,11 +170,14 @@ extern void swapin_readahead(swp_entry_t extern unsigned long totalram_pages; extern unsigned long totalreserve_pages; extern long nr_swap_pages; -extern unsigned int nr_free_pages(void); 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); +/* Definition of global_page_state not available yet */ +#define nr_free_pages() global_page_state(NR_FREE_PAGES) + + /* linux/mm/swap.c */ extern void FASTCALL(lru_cache_add(struct page *)); extern void FASTCALL(lru_cache_add_active(struct page *)); diff -puN kernel/power/main.c~drop-free_pages kernel/power/main.c --- a/kernel/power/main.c~drop-free_pages +++ a/kernel/power/main.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "power.h" @@ -72,7 +73,8 @@ static int suspend_prepare(suspend_state goto Thaw; } - if ((free_pages = nr_free_pages()) < FREE_PAGE_NUMBER) { + if ((free_pages = global_page_state(NR_FREE_PAGES)) + < FREE_PAGE_NUMBER) { pr_debug("PM: free some memory\n"); shrink_all_memory(FREE_PAGE_NUMBER - free_pages); if (nr_free_pages() < FREE_PAGE_NUMBER) { diff -puN mm/page_alloc.c~drop-free_pages mm/page_alloc.c --- a/mm/page_alloc.c~drop-free_pages +++ a/mm/page_alloc.c @@ -1441,16 +1441,6 @@ fastcall void free_pages(unsigned long a EXPORT_SYMBOL(free_pages); -/* - * Total amount of free (allocatable) RAM: - */ -unsigned int nr_free_pages(void) -{ - return global_page_state(NR_FREE_PAGES); -} - -EXPORT_SYMBOL(nr_free_pages); - #ifdef CONFIG_NUMA unsigned int nr_free_pages_pgdat(pg_data_t *pgdat) { _