← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lowlatency/precise-proposed

« back to all changes in this revision

Viewing changes to mm/sparse.c

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Luke Yelavich, Upstream Kernel Changes
  • Date: 2012-04-04 18:49:36 UTC
  • Revision ID: package-import@ubuntu.com-20120404184936-tqu735914muv4wpg
Tags: 3.2.0-22.30
[ Luke Yelavich ]

* [Config] Update configs after rebase against Ubuntu-3.2.0-22.35

[ Upstream Kernel Changes ]

* Low-latency: Rebase against Ubuntu-3.2.0-22.35

Show diffs side-by-side

added added

removed removed

Lines of Context:
mm/sparse.c
353
353
 
354
354
        usemap = sparse_early_usemaps_alloc_pgdat_section(NODE_DATA(nodeid),
355
355
                                                                 usemap_count);
356
 
        if (usemap) {
357
 
                for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
358
 
                        if (!present_section_nr(pnum))
359
 
                                continue;
360
 
                        usemap_map[pnum] = usemap;
361
 
                        usemap += size;
362
 
                }
363
 
                return;
364
 
        }
365
 
 
366
 
        usemap = alloc_bootmem_node(NODE_DATA(nodeid), size * usemap_count);
367
 
        if (usemap) {
368
 
                for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
369
 
                        if (!present_section_nr(pnum))
370
 
                                continue;
371
 
                        usemap_map[pnum] = usemap;
372
 
                        usemap += size;
373
 
                        check_usemap_section_nr(nodeid, usemap_map[pnum]);
374
 
                }
375
 
                return;
376
 
        }
377
 
 
378
 
        printk(KERN_WARNING "%s: allocation failed\n", __func__);
 
356
        if (!usemap) {
 
357
                usemap = alloc_bootmem_node(NODE_DATA(nodeid), size * usemap_count);
 
358
                if (!usemap) {
 
359
                        printk(KERN_WARNING "%s: allocation failed\n", __func__);
 
360
                        return;
 
361
                }
 
362
        }
 
363
 
 
364
        for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
 
365
                if (!present_section_nr(pnum))
 
366
                        continue;
 
367
                usemap_map[pnum] = usemap;
 
368
                usemap += size;
 
369
                check_usemap_section_nr(nodeid, usemap_map[pnum]);
 
370
        }
379
371
}
380
372
 
381
373
#ifndef CONFIG_SPARSEMEM_VMEMMAP