Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (31 commits)
  driver core: Display error codes when class suspend fails
  Driver core: Add section count to memory_block struct
  Driver core: Add mutex for adding/removing memory blocks
  Driver core: Move find_memory_block routine
  hpilo: Despecificate driver from iLO generation
  driver core: Convert link_mem_sections to use find_memory_block_hinted.
  driver core: Introduce find_memory_block_hinted which utilizes kset_find_obj_hinted.
  kobject: Introduce kset_find_obj_hinted.
  driver core: fix build for CONFIG_BLOCK not enabled
  driver-core: base: change to new flag variable
  sysfs: only access bin file vm_ops with the active lock
  sysfs: Fail bin file mmap if vma close is implemented.
  FW_LOADER: fix kconfig dependency warning on HOTPLUG
  uio: Statically allocate uio_class and use class .dev_attrs.
  uio: Support 2^MINOR_BITS minors
  uio: Cleanup irq handling.
  uio: Don't clear driver data
  uio: Fix lack of locking in init_uio_class
  SYSFS: Allow boot time switching between deprecated and modern sysfs layout
  driver core: remove CONFIG_SYSFS_DEPRECATED_V2 but keep it for block devices
  ...

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/base/node.c b/drivers/base/node.c
index 2872e86837b2..ee53558b452f 100644
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
@@ -409,25 +409,27 @@ static int link_mem_sections(int nid)
         unsigned long start_pfn = NODE_DATA(nid)->node_start_pfn;
         unsigned long end_pfn = start_pfn + NODE_DATA(nid)->node_spanned_pages;
         unsigned long pfn;
+        struct memory_block *mem_blk = NULL;
         int err = 0;
 
         for (pfn = start_pfn; pfn < end_pfn; pfn += PAGES_PER_SECTION) {
                 unsigned long section_nr = pfn_to_section_nr(pfn);
                 struct mem_section *mem_sect;
-                struct memory_block *mem_blk;
                 int ret;
 
                 if (!present_section_nr(section_nr))
                         continue;
                 mem_sect = __nr_to_section(section_nr);
-                mem_blk = find_memory_block(mem_sect);
+                mem_blk = find_memory_block_hinted(mem_sect, mem_blk);
                 ret = register_mem_sect_under_node(mem_blk, nid);
                 if (!err)
                         err = ret;
 
                 /* discard ref obtained in find_memory_block() */
-                kobject_put(&mem_blk->sysdev.kobj);
         }
+
+        if (mem_blk)
+                kobject_put(&mem_blk->sysdev.kobj);
         return err;
 }