From: Christoph Lameter <clameter@sgi.com>

Move include of vmstat.h into mm.h

Some inline functions in vmstat.h need inline definitions from mm.h

So do the same as we already to for page-flags: Include vmstat.h in
mm.h where it fits in.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/mm.h         |    6 +++++-
 include/linux/page-flags.h |    1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff -puN include/linux/mm.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-fix-2 include/linux/mm.h
--- 25/include/linux/mm.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-fix-2	Tue Jun 27 15:22:34 2006
+++ 25-akpm/include/linux/mm.h	Tue Jun 27 15:22:34 2006
@@ -4,7 +4,6 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/capability.h>
-#include <linux/vmstat.h>
 
 #ifdef __KERNEL__
 
@@ -523,6 +522,11 @@ static inline void set_page_links(struct
 	set_page_section(page, pfn_to_section_nr(pfn));
 }
 
+/*
+ * Some inline functions in vmstat.h depend on page_zone()
+ */
+#include <linux/vmstat.h>
+
 #ifndef CONFIG_DISCONTIGMEM
 /* The array of struct pages - for discontigmem use pgdat->lmem_map */
 extern struct page *mem_map;
diff -puN include/linux/page-flags.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-fix-2 include/linux/page-flags.h
--- 25/include/linux/page-flags.h~zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-fix-2	Tue Jun 27 15:22:34 2006
+++ 25-akpm/include/linux/page-flags.h	Tue Jun 27 15:22:34 2006
@@ -6,7 +6,6 @@
 #define PAGE_FLAGS_H
 
 #include <linux/types.h>
-#include <linux/vmstat.h>
 
 /*
  * Various page->flags bits:
_