diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-24 16:48:27 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-24 16:48:27 -0800 |
| commit | ffd76d8be36da09f8456c55569c008f5aa93095e (patch) | |
| tree | 4a5e537edcdd3be9197c5fb7af1b4f7e4780ef77 /drivers/base/node.c | |
| parent | bfe9c8ae114009491f51452ec727667d516ee79f (diff) | |
| parent | f0e15e2b0c6b3e89daade25a1e9a2d80136c14c3 (diff) | |
| download | linux-ffd76d8be36da09f8456c55569c008f5aa93095e.tar.bz2 | |
Merge branch 'for_3.4/dts_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'drivers/base/node.c')
| -rw-r--r-- | drivers/base/node.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 44f427a66117..90aa2a11a933 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -456,7 +456,15 @@ static int link_mem_sections(int nid) if (!present_section_nr(section_nr)) continue; mem_sect = __nr_to_section(section_nr); + + /* same memblock ? */ + if (mem_blk) + if ((section_nr >= mem_blk->start_section_nr) && + (section_nr <= mem_blk->end_section_nr)) + continue; + mem_blk = find_memory_block_hinted(mem_sect, mem_blk); + ret = register_mem_sect_under_node(mem_blk, nid); if (!err) err = ret; |