Merge branch 'driver-core-next' into Linux 3.2

[linux-2.6-block.git] / arch / powerpc / mm / numa.c

diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index b22a83a91cb852b92d023529e3f1b3bf011dce38..b088e985bee255e99f924cbf6984cc471f16ea5f 100644 (file)
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -1462,7 +1462,7 @@ int arch_update_cpu_topology(void)
 {
        int cpu, nid, old_nid;
        unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
-       struct sys_device *sysdev;
+       struct device *dev;
 
        for_each_cpu(cpu,&cpu_associativity_changes_mask) {
                vphn_get_associativity(cpu, associativity);
@@ -1483,9 +1483,9 @@ int arch_update_cpu_topology(void)
                register_cpu_under_node(cpu, nid);
                put_online_cpus();
 
-               sysdev = get_cpu_sysdev(cpu);
-               if (sysdev)
-                       kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
+               dev = get_cpu_device(cpu);
+               if (dev)
+                       kobject_uevent(&dev->kobj, KOBJ_CHANGE);
        }
 
        return 1;