---
 include/linux/mm.h     |    4 ----
 include/linux/mmzone.h |    5 -----
 mm/Kconfig             |   32 +++++---------------------------
 3 files changed, 5 insertions(+), 36 deletions(-)

Index: vmemmap/include/linux/mm.h
===================================================================
--- vmemmap.orig/include/linux/mm.h	2007-06-07 17:21:56.000000000 -0700
+++ vmemmap/include/linux/mm.h	2007-06-07 17:22:06.000000000 -0700
@@ -20,10 +20,6 @@ struct mempolicy;
 struct anon_vma;
 struct user_struct;
 
-#ifndef CONFIG_DISCONTIGMEM          /* Don't use mapnrs, do it properly */
-extern unsigned long max_mapnr;
-#endif
-
 extern unsigned long num_physpages;
 extern void * high_memory;
 extern unsigned long vmalloc_earlyreserve;
Index: vmemmap/include/linux/mmzone.h
===================================================================
--- vmemmap.orig/include/linux/mmzone.h	2007-06-07 17:22:13.000000000 -0700
+++ vmemmap/include/linux/mmzone.h	2007-06-07 17:22:18.000000000 -0700
@@ -450,11 +450,6 @@ struct node_active_region {
 };
 #endif /* CONFIG_ARCH_POPULATES_NODE_MAP */
 
-#ifndef CONFIG_DISCONTIGMEM
-/* The array of struct pages - for discontigmem use pgdat->lmem_map */
-extern struct page *mem_map;
-#endif
-
 /*
  * The pg_data_t structure is used in machines with CONFIG_DISCONTIGMEM
  * (mostly NUMA machines?) to denote a higher-level memory zone than the
Index: vmemmap/mm/Kconfig
===================================================================
--- vmemmap.orig/mm/Kconfig	2007-06-07 17:23:39.000000000 -0700
+++ vmemmap/mm/Kconfig	2007-06-07 17:25:56.000000000 -0700
@@ -5,13 +5,11 @@ config SELECT_MEMORY_MODEL
 choice
 	prompt "Memory model"
 	depends on SELECT_MEMORY_MODEL
-	default DISCONTIGMEM_MANUAL if ARCH_DISCONTIGMEM_DEFAULT
-	default SPARSEMEM_MANUAL if ARCH_SPARSEMEM_DEFAULT
-	default FLATMEM_MANUAL
+	default SPARSEMEM_MANUAL if !FLATMEM_MANUAL
 
 config FLATMEM_MANUAL
 	bool "Flat Memory"
-	depends on !(ARCH_DISCONTIGMEM_ENABLE || ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE
+	depends on !(ARCH_SPARSEMEM_ENABLE) || ARCH_FLATMEM_ENABLE
 	help
 	  This option allows you to change some of the ways that
 	  Linux manages its memory internally.  Most users will
@@ -28,22 +26,6 @@ config FLATMEM_MANUAL
 
 	  If unsure, choose this option (Flat Memory) over any other.
 
-config DISCONTIGMEM_MANUAL
-	bool "Discontiguous Memory"
-	depends on ARCH_DISCONTIGMEM_ENABLE
-	help
-	  This option provides enhanced support for discontiguous
-	  memory systems, over FLATMEM.  These systems have holes
-	  in their physical address spaces, and this option provides
-	  more efficient handling of these holes.  However, the vast
-	  majority of hardware has quite flat address spaces, and
-	  can have degraded performance from extra overhead that
-	  this option imposes.
-
-	  Many NUMA configurations will have this as the only option.
-
-	  If unsure, choose "Flat Memory" over this option.
-
 config SPARSEMEM_MANUAL
 	bool "Sparse Memory"
 	depends on ARCH_SPARSEMEM_ENABLE
@@ -61,30 +43,26 @@ config SPARSEMEM_MANUAL
 
 endchoice
 
-config DISCONTIGMEM
-	def_bool y
-	depends on (!SELECT_MEMORY_MODEL && ARCH_DISCONTIGMEM_ENABLE) || DISCONTIGMEM_MANUAL
-
 config SPARSEMEM
 	def_bool y
 	depends on SPARSEMEM_MANUAL
 
 config FLATMEM
 	def_bool y
-	depends on (!DISCONTIGMEM && !SPARSEMEM) || FLATMEM_MANUAL
+	depends on !SPARSEMEM || FLATMEM_MANUAL
 
 config FLAT_NODE_MEM_MAP
 	def_bool y
 	depends on !SPARSEMEM
 
 #
-# Both the NUMA code and DISCONTIGMEM use arrays of pg_data_t's
+# The NUMA code uses arrays of pg_data_t's
 # to represent different areas of memory.  This variable allows
 # those dependencies to exist individually.
 #
 config NEED_MULTIPLE_NODES
 	def_bool y
-	depends on DISCONTIGMEM || NUMA
+	depends on NUMA
 
 config HAVE_MEMORY_PRESENT
 	def_bool y