[ZVC 3/4] Include vmstat.h in mm.h and not in page-flags.h

From: Christoph Lameter
Date: Tue Jun 27 2006 - 13:45:13 EST


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@xxxxxxx>

Index: linux-2.6.17-mm3/include/linux/mm.h
===================================================================
--- linux-2.6.17-mm3.orig/include/linux/mm.h 2006-06-27 09:40:23.405892736 -0700
+++ linux-2.6.17-mm3/include/linux/mm.h 2006-06-27 10:29:56.424844789 -0700
@@ -4,7 +4,6 @@
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/capability.h>
-#include <linux/vmstat.h>

#ifdef __KERNEL__

@@ -524,6 +523,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;
Index: linux-2.6.17-mm3/include/linux/page-flags.h
===================================================================
--- linux-2.6.17-mm3.orig/include/linux/page-flags.h 2006-06-27 09:40:23.561156562 -0700
+++ linux-2.6.17-mm3/include/linux/page-flags.h 2006-06-27 10:27:36.956934646 -0700
@@ -6,7 +6,6 @@
#define PAGE_FLAGS_H

#include <linux/types.h>
-#include <linux/vmstat.h>

/*
* Various page->flags bits:
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/