Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / base / topology.c

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 915810f6237eeca929235e1502983080989a3376..28dccb730af99032a9bf653990b604df35ff29b9 100644 (file)
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -97,8 +97,7 @@ static struct attribute_group topology_attr_group = {
 /* Add/Remove cpu_topology interface for CPU device */
 static int __cpuinit topology_add_dev(struct sys_device * sys_dev)
 {
-       sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
-       return 0;
+       return sysfs_create_group(&sys_dev->kobj, &topology_attr_group);
 }
 
 static int __cpuinit topology_remove_dev(struct sys_device * sys_dev)
@@ -125,7 +124,7 @@ static int __cpuinit topology_cpu_callback(struct notifier_block *nfb,
        return NOTIFY_OK;
 }
 
-static struct notifier_block topology_cpu_notifier =
+static struct notifier_block __cpuinitdata topology_cpu_notifier =
 {
        .notifier_call = topology_cpu_callback,
 };
@@ -139,7 +138,7 @@ static int __cpuinit topology_sysfs_init(void)
                                (void *)(long)i);
        }
 
-       register_cpu_notifier(&topology_cpu_notifier);
+       register_hotcpu_notifier(&topology_cpu_notifier);
 
        return 0;
 }