Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 13 insertions, 2 deletions

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index f255eda693b0..beb592fe9389 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -423,7 +423,7 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
         struct task_struct *p;
 
         cgroup_lock();
-        rcu_read_lock();
+        read_lock(&tasklist_lock);
 retry:
         p = select_bad_process(&points, mem);
         if (PTR_ERR(p) == -1UL)
@@ -436,7 +436,7 @@ retry:
                                 "Memory cgroup out of memory"))
                 goto retry;
 out:
-        rcu_read_unlock();
+        read_unlock(&tasklist_lock);
         cgroup_unlock();
 }
 #endif
diff --git a/mm/sparse.c b/mm/sparse.c
index f6a43c09c322..98d6b39c3472 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -149,8 +149,18 @@ static inline int sparse_early_nid(struct mem_section *section)
 /* Record a memory area against a node. */
 void __init memory_present(int nid, unsigned long start, unsigned long end)
 {
+        unsigned long max_arch_pfn = 1UL << (MAX_PHYSMEM_BITS-PAGE_SHIFT);
         unsigned long pfn;
 
+        /*
+         * Sanity checks - do not allow an architecture to pass
+         * in larger pfns than the maximum scope of sparsemem:
+         */
+        if (start >= max_arch_pfn)
+                return;
+        if (end >= max_arch_pfn)
+                end = max_arch_pfn;
+
         start &= PAGE_SECTION_MASK;
         for (pfn = start; pfn < end; pfn += PAGES_PER_SECTION) {
                 unsigned long section = pfn_to_section_nr(pfn);
diff --git a/mm/vmstat.c b/mm/vmstat.c
index 422d960ffcd8..7c7286e9506d 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -388,6 +388,7 @@ static char * const migratetype_names[MIGRATE_TYPES] = {
         "Reclaimable",
         "Movable",
         "Reserve",
+        "Isolate",
 };
 
 static void *frag_start(struct seq_file *m, loff_t *pos)