summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorDave Hansen <haveblue@us.ibm.com>2005-03-09 16:30:30 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-09 16:30:30 -0800
commit3c810c5057c4a15fe01a4a3de1b9de0f8a8ecc48 (patch)
tree11fa1bf3839439f75daba7e4156d1107ef95402a /include/linux
parentf7e3b0c7b98b748fe462dd95918dc17afff3bc00 (diff)
[PATCH] x86: abstract discontigmem setup
memory_present() is how each arch/subarch will tell sparsemem and discontigmem where all of its memory is. This is what triggers sparse to go out and create its mappings for the memory, as well as allocate the mem_map[]. By: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Dave Hansen <haveblue@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mmzone.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index a2b35dbc84f7..e530c6c092f1 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -11,6 +11,7 @@
#include <linux/cache.h>
#include <linux/threads.h>
#include <linux/numa.h>
+#include <linux/init.h>
#include <asm/atomic.h>
/* Free memory management - zoned buddy allocator. */
@@ -278,6 +279,16 @@ void wakeup_kswapd(struct zone *zone, int order);
int zone_watermark_ok(struct zone *z, int order, unsigned long mark,
int alloc_type, int can_try_harder, int gfp_high);
+#ifdef CONFIG_HAVE_MEMORY_PRESENT
+void memory_present(int nid, unsigned long start, unsigned long end);
+#else
+static inline void memory_present(int nid, unsigned long start, unsigned long end) {}
+#endif
+
+#ifdef CONFIG_NEED_NODE_MEMMAP_SIZE
+unsigned long __init node_memmap_size_bytes(int, unsigned long, unsigned long);
+#endif
+
/*
* zone_idx() returns 0 for the ZONE_DMA zone, 1 for the ZONE_NORMAL zone, etc.
*/