The patch titled
Include vmstat.h in mm.h and not in page-flags.h
has been added to the -mm tree. Its filename is
zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-fix-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Include vmstat.h in mm.h and not in page-flags.h
From: Christoph Lameter <clameter@xxxxxxx>
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>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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:
_
Patches currently in -mm which might be from clameter@xxxxxxx are
origin.patch
zoned-vm-counters-create-vmstatc-h-from-page_allocc-h.patch
zoned-vm-counters-create-vmstatc-h-from-page_allocc-h-fix-2.patch
zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation.patch
zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-tidy.patch
zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-speedup.patch
zoned-vm-counters-basic-zvc-zoned-vm-counter-implementation-speedup-fix.patch
zoned-vm-counters-convert-nr_mapped-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_pagecache-to-per-zone-counter.patch
zoned-vm-counters-remove-nr_file_mapped-from-scan-control-structure.patch
zoned-vm-counters-remove-nr_file_mapped-from-scan-control-structure-fix.patch
zoned-vm-counters-split-nr_anon_pages-off-from-nr_file_mapped.patch
zoned-vm-counters-zone_reclaim-remove-proc-sys-vm-zone_reclaim_interval.patch
zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_slab-to-per-zone-counter-fix-2.patch
zoned-vm-counters-conversion-of-nr_pagetables-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_dirty-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_writeback-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_unstable-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_bounce-to-per-zone-counter.patch
zoned-vm-counters-conversion-of-nr_bounce-to-per-zone-counter-fix-2.patch
zoned-vm-counters-remove-useless-struct-wbs.patch
use-zoned-vm-counters-for-numa-statistics-v3.patch
light-weight-event-counters-v5.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
