Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup

* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
  rtc: sa1100: remove verification code of alarm
  rtc: sa1100: remove periodic code

(update to v3.3-rc5)

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;