summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-02-10 12:43:03 +0300
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 21:51:18 +0300
commit96177299416dbccb73b54e6b344260154a445375 (patch)
tree586454851d0fbbb365d6b12c852d5a7dd6b004f4 /include
parent51ed4491271be8c56bdb2a03481ed34ea4984bc2 (diff)
downloadlinux-96177299416dbccb73b54e6b344260154a445375.tar.xz
[PATCH] Drop free_pages()
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. [akpm@osdl.org: arm build fix] [akpm@osdl.org: sparc64 build fix] Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/swap.h5
-rw-r--r--include/linux/vmstat.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 5423559a44a6..817e1b47007f 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -170,11 +170,14 @@ 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(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 --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index c8d55bcc09b9..77caf911969c 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -3,6 +3,7 @@
#include <linux/types.h>
#include <linux/percpu.h>
+#include <linux/mm.h>
#include <linux/mmzone.h>
#include <asm/atomic.h>