[RFC] [PATCH] virtual memmap on sparsemem v3 [3/4] static virtual mem_map

[KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>]

This patch adds support for statically allocated virtual mem_map.
(means virtual address of mem_map array is defined statically.)
This removes reference to *(&mem_map).

Signed-Off-By: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>


Index: devel-2.6.19/include/linux/mmzone.h
===================================================================
--- devel-2.6.19.orig/include/linux/mmzone.h	2006-12-08 15:04:30.000000000 +0900
+++ devel-2.6.19/include/linux/mmzone.h	2006-12-08 15:05:18.000000000 +0900
@@ -618,8 +618,13 @@
 #if (((BITS_PER_LONG/4) * PAGES_PER_SECTION) % PAGE_SIZE) != 0
 #error "PAGE_SIZE/SECTION_SIZE relationship is not suitable for vmem_map"
 #endif
+#ifdef CONFIG_SPARSEMEM_VMEMMAP_STATIC
+#include <linux/mm_types.h>
+extern struct page mem_map[];
+#else
 extern struct page* mem_map;
 #endif
+#endif
 
 static inline struct page *__section_mem_map_addr(struct mem_section *section)
 {
Index: devel-2.6.19/mm/Kconfig
===================================================================
--- devel-2.6.19.orig/mm/Kconfig	2006-12-08 15:05:10.000000000 +0900
+++ devel-2.6.19/mm/Kconfig	2006-12-08 15:05:18.000000000 +0900
@@ -121,6 +121,10 @@
 	  But this consumes huge amount of virtual memory(not physical).
 	  This option is selectable only if your arch supports it.
 
+config SPARSEMEM_VMEMMAP_STATIC
+	def_bool y
+	depends on ARCH_SPARSEMEM_VMEMMAP_STATIC
+
 # eventually, we can have this option just 'select SPARSEMEM'
 config MEMORY_HOTPLUG
 	bool "Allow for memory hot-add"
Index: devel-2.6.19/mm/memory.c
===================================================================
--- devel-2.6.19.orig/mm/memory.c	2006-12-08 15:03:02.000000000 +0900
+++ devel-2.6.19/mm/memory.c	2006-12-08 15:09:00.000000000 +0900
@@ -71,7 +71,9 @@
 
 #ifdef CONFIG_SPARSEMEM_VMEMMAP
 /* for the virtual mem_map */
+#ifndef CONFIG_SPARSEMEM_VMEMMAP_STATIC
 struct page *mem_map;
+#endif
 EXPORT_SYMBOL(mem_map);
 #endif
 

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