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

[firefly-linux-kernel-4.4.55.git] / arch / s390 / kernel / topology.c

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index fdb5b8cb260f683e1f4559f95c006a7838690f60..6e0e29b29a7b293b26c58dccd4946b9932e3cf9b 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -261,7 +261,7 @@ void store_topology(struct sysinfo_15_1_x *info)
 int arch_update_cpu_topology(void)
 {
        struct sysinfo_15_1_x *info = tl_info;
-       struct sys_device *sysdev;
+       struct device *dev;
        int cpu;
 
        if (!MACHINE_HAS_TOPOLOGY) {
@@ -273,8 +273,8 @@ int arch_update_cpu_topology(void)
        tl_to_cores(info);
        update_cpu_core_map();
        for_each_online_cpu(cpu) {
-               sysdev = get_cpu_sysdev(cpu);
-               kobject_uevent(&sysdev->kobj, KOBJ_CHANGE);
+               dev = get_cpu_device(cpu);
+               kobject_uevent(&dev->kobj, KOBJ_CHANGE);
        }
        return 1;
 }