4 files changed, 26 insertions, 15 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index e4b530ef757d..67b79a7592a9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -386,6 +386,7 @@ void device_initialize(struct device *dev)
         INIT_LIST_HEAD(&dev->node);
         init_MUTEX(&dev->sem);
         device_init_wakeup(dev, 0);
+        set_dev_node(dev, -1);
 }
 
 #ifdef CONFIG_SYSFS_DEPRECATED
diff --git a/drivers/base/dmapool.c b/drivers/base/dmapool.c
index b2efbd4cf710..dbe0735f8c9e 100644
--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@@ -126,7 +126,7 @@ dma_pool_create (const char *name, struct device *dev,
         } else if (allocation < size)
                 return NULL;
 
-        if (!(retval = kmalloc (sizeof *retval, SLAB_KERNEL)))
+        if (!(retval = kmalloc (sizeof *retval, GFP_KERNEL)))
                 return retval;
 
         strlcpy (retval->name, name, sizeof retval->name);
@@ -297,7 +297,7 @@ restart:
                         }
                 }
         }
-        if (!(page = pool_alloc_page (pool, SLAB_ATOMIC))) {
+        if (!(page = pool_alloc_page (pool, GFP_ATOMIC))) {
                 if (mem_flags & __GFP_WAIT) {
                         DECLARE_WAITQUEUE (wait, current);
 
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index c6b7d9c4b651..74b96795d2f5 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -290,9 +290,8 @@ static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
 
 static int block_size_init(void)
 {
-        sysfs_create_file(&memory_sysdev_class.kset.kobj,
-                &class_attr_block_size_bytes.attr);
-        return 0;
+        return sysfs_create_file(&memory_sysdev_class.kset.kobj,
+                                &class_attr_block_size_bytes.attr);
 }
 
 /*
@@ -323,12 +322,14 @@ static CLASS_ATTR(probe, 0700, NULL, memory_probe_store);
 
 static int memory_probe_init(void)
 {
-        sysfs_create_file(&memory_sysdev_class.kset.kobj,
-                &class_attr_probe.attr);
-        return 0;
+        return sysfs_create_file(&memory_sysdev_class.kset.kobj,
+                                &class_attr_probe.attr);
 }
 #else
-#define memory_probe_init(...)  do {} while (0)
+static inline int memory_probe_init(void)
+{
+        return 0;
+}
 #endif
 
 /*
@@ -431,9 +432,12 @@ int __init memory_dev_init(void)
 {
         unsigned int i;
         int ret;
+        int err;
 
         memory_sysdev_class.kset.uevent_ops = &memory_uevent_ops;
         ret = sysdev_class_register(&memory_sysdev_class);
+        if (ret)
+                goto out;
 
         /*
          * Create entries for memory sections that were found
@@ -442,11 +446,19 @@ int __init memory_dev_init(void)
         for (i = 0; i < NR_MEM_SECTIONS; i++) {
                 if (!valid_section_nr(i))
                         continue;
-                add_memory_block(0, __nr_to_section(i), MEM_ONLINE, 0);
+                err = add_memory_block(0, __nr_to_section(i), MEM_ONLINE, 0);
+                if (!ret)
+                        ret = err;
         }
 
-        memory_probe_init();
-        block_size_init();
-
+        err = memory_probe_init();
+        if (!ret)
+                ret = err;
+        err = block_size_init();
+        if (!ret)
+                ret = err;
+out:
+        if (ret)
+                printk(KERN_ERR "%s() failed: %d\n", __FUNCTION__, ret);
         return ret;
 }
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 3d12b85b0962..067a9e8bc377 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -108,7 +108,6 @@ static int __cpuinit topology_add_dev(unsigned int cpu)
         return rc;
 }
 
-#ifdef CONFIG_HOTPLUG_CPU
 static void __cpuinit topology_remove_dev(unsigned int cpu)
 {
         struct sys_device *sys_dev = get_cpu_sysdev(cpu);
@@ -136,7 +135,6 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
         }
         return rc ? NOTIFY_BAD : NOTIFY_OK;
 }
-#endif
 
 static int __cpuinit topology_sysfs_init(void)
 {