Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/linux/kernel.h

1 files changed, 21 insertions, 4 deletions

diff --git a/mm/sparse.c b/mm/sparse.c
index 100040c0dfb6..86c52ab80878 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -1,7 +1,6 @@
 /*
  * sparse memory mappings.
  */
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/bootmem.h>
@@ -45,7 +44,7 @@ static struct mem_section *sparse_index_alloc(int nid)
 
 static int sparse_index_init(unsigned long section_nr, int nid)
 {
-        static spinlock_t index_init_lock = SPIN_LOCK_UNLOCKED;
+        static DEFINE_SPINLOCK(index_init_lock);
         unsigned long root = SECTION_NR_TO_ROOT(section_nr);
         struct mem_section *section;
         int ret = 0;
@@ -99,6 +98,22 @@ int __section_nr(struct mem_section* ms)
         return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
 }
 
+/*
+ * During early boot, before section_mem_map is used for an actual
+ * mem_map, we use section_mem_map to store the section's NUMA
+ * node.  This keeps us from having to use another data structure.  The
+ * node information is cleared just before we store the real mem_map.
+ */
+static inline unsigned long sparse_encode_early_nid(int nid)
+{
+        return (nid << SECTION_NID_SHIFT);
+}
+
+static inline int sparse_early_nid(struct mem_section *section)
+{
+        return (section->section_mem_map >> SECTION_NID_SHIFT);
+}
+
 /* Record a memory area against a node. */
 void memory_present(int nid, unsigned long start, unsigned long end)
 {
@@ -113,7 +128,8 @@ void memory_present(int nid, unsigned long start, unsigned long end)
 
                 ms = __nr_to_section(section);
                 if (!ms->section_mem_map)
-                        ms->section_mem_map = SECTION_MARKED_PRESENT;
+                        ms->section_mem_map = sparse_encode_early_nid(nid) |
+                                                        SECTION_MARKED_PRESENT;
         }
 }
 
@@ -164,6 +180,7 @@ static int sparse_init_one_section(struct mem_section *ms,
         if (!valid_section(ms))
                 return -EINVAL;
 
+        ms->section_mem_map &= ~SECTION_MAP_MASK;
         ms->section_mem_map |= sparse_encode_mem_map(mem_map, pnum);
 
         return 1;
@@ -172,8 +189,8 @@ static int sparse_init_one_section(struct mem_section *ms,
 static struct page *sparse_early_mem_map_alloc(unsigned long pnum)
 {
         struct page *map;
-        int nid = early_pfn_to_nid(section_nr_to_pfn(pnum));
         struct mem_section *ms = __nr_to_section(pnum);
+        int nid = sparse_early_nid(ms);
 
         map = alloc_remap(nid, sizeof(struct page) * PAGES_PER_SECTION);
         if (map)