Merge commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81' into stable/for-linus-3.4

* commit 'c104f1fa1ecf4ee0fc06e31b1f77630b2551be81': (14566 commits)
  cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
  sparc64: Eliminate obsolete __handle_softirq() function
  sparc64: Fix bootup crash on sun4v.
  kconfig: delete last traces of __enabled_ from autoconf.h
  Revert "kconfig: fix __enabled_ macros definition for invisible and un-selected symbols"
  kconfig: fix IS_ENABLED to not require all options to be defined
  irq_domain: fix type mismatch in debugfs output format
  staging: android: fix mem leaks in __persistent_ram_init()
  staging: vt6656: Don't leak memory in drivers/staging/vt6656/ioctl.c::private_ioctl()
  staging: iio: hmc5843: Fix crash in probe function.
  panic: fix stack dump print on direct call to panic()
  drivers/rtc/rtc-pl031.c: enable clock on all ST variants
  Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()"
  hugetlb: fix race condition in hugetlb_fault()
  drivers/rtc/rtc-twl.c: use static register while reading time
  drivers/rtc/rtc-s3c.c: add placeholder for driver private data
  drivers/rtc/rtc-s3c.c: fix compilation error
  MAINTAINERS: add PCDP console maintainer
  memcg: do not open code accesses to res_counter members
  drivers/rtc/rtc-efi.c: fix section mismatch warning
  ...

1 files changed, 11 insertions, 19 deletions

diff --git a/mm/sparse.c b/mm/sparse.c
index 61d7cde23111..a8bc7d364deb 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -353,29 +353,21 @@ static void __init sparse_early_usemaps_alloc_node(unsigned long**usemap_map,
 
         usemap = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nodeid),
                                                                  usemap_count);
-        if (usemap) {
-                for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
-                        if (!present_section_nr(pnum))
-                                continue;
-                        usemap_map[pnum] = usemap;
-                        usemap += size;
+        if (!usemap) {
+                usemap = alloc_bootmem_node(NODE_DATA(nodeid), size * usemap_count);
+                if (!usemap) {
+                        printk(KERN_WARNING "%s: allocation failed\n", __func__);
+                        return;
                 }
-                return;
         }
 
-        usemap = alloc_bootmem_node(NODE_DATA(nodeid), size * usemap_count);
-        if (usemap) {
-                for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
-                        if (!present_section_nr(pnum))
-                                continue;
-                        usemap_map[pnum] = usemap;
-                        usemap += size;
-                        check_usemap_section_nr(nodeid, usemap_map[pnum]);
-                }
-                return;
+        for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
+                if (!present_section_nr(pnum))
+                        continue;
+                usemap_map[pnum] = usemap;
+                usemap += size;
+                check_usemap_section_nr(nodeid, usemap_map[pnum]);
         }
-
-        printk(KERN_WARNING "%s: allocation failed\n", __func__);
 }
 
 #ifndef CONFIG_SPARSEMEM_VMEMMAP