Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / arch / s390 / kernel / smp.c

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 9e8b1f9b8f4d6bcfcfd477e2b965030bd236cc10..b5595688a47777d72eb803dd00fd8a15b35dee66 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -1119,9 +1119,7 @@ out:
        return rc;
 }
 
-static ssize_t __ref rescan_store(struct sys_device *dev,
-                                 struct sysdev_attribute *attr,
-                                 const char *buf,
+static ssize_t __ref rescan_store(struct sysdev_class *class, const char *buf,
                                  size_t count)
 {
        int rc;
@@ -1129,12 +1127,10 @@ static ssize_t __ref rescan_store(struct sys_device *dev,
        rc = smp_rescan_cpus();
        return rc ? rc : count;
 }
-static SYSDEV_ATTR(rescan, 0200, NULL, rescan_store);
+static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store);
 #endif /* CONFIG_HOTPLUG_CPU */
 
-static ssize_t dispatching_show(struct sys_device *dev,
-                               struct sysdev_attribute *attr,
-                               char *buf)
+static ssize_t dispatching_show(struct sysdev_class *class, char *buf)
 {
        ssize_t count;
 
@@ -1144,9 +1140,8 @@ static ssize_t dispatching_show(struct sys_device *dev,
        return count;
 }
 
-static ssize_t dispatching_store(struct sys_device *dev,
-                                struct sysdev_attribute *attr,
-                                const char *buf, size_t count)
+static ssize_t dispatching_store(struct sysdev_class *dev, const char *buf,
+                                size_t count)
 {
        int val, rc;
        char delim;
@@ -1168,7 +1163,8 @@ out:
        put_online_cpus();
        return rc ? rc : count;
 }
-static SYSDEV_ATTR(dispatching, 0644, dispatching_show, dispatching_store);
+static SYSDEV_CLASS_ATTR(dispatching, 0644, dispatching_show,
+                        dispatching_store);
 
 static int __init topology_init(void)
 {
@@ -1178,13 +1174,11 @@ static int __init topology_init(void)
        register_cpu_notifier(&smp_cpu_nb);
 
 #ifdef CONFIG_HOTPLUG_CPU
-       rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                              &attr_rescan.attr);
+       rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_rescan);
        if (rc)
                return rc;
 #endif
-       rc = sysfs_create_file(&cpu_sysdev_class.kset.kobj,
-                              &attr_dispatching.attr);
+       rc = sysdev_class_create_file(&cpu_sysdev_class, &attr_dispatching);
        if (rc)
                return rc;
        for_each_present_cpu(cpu) {