Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

[mv-sheeva.git] / arch / powerpc / kernel / sysfs.c

diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index d7835ba9fb8c0c38638fd97afc713d90e43b19ea..c8127f832df0f6d28d8efb0ee3a2097f8933dcce 100644 (file)
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -158,7 +158,7 @@ static ssize_t show_##NAME(struct sys_device *dev, char *buf) \
        unsigned long val = run_on_cpu(cpu->sysdev.id, read_##NAME, 0); \
        return sprintf(buf, "%lx\n", val); \
 } \
-static ssize_t __attribute_used__ \
+static ssize_t __used \
        store_##NAME(struct sys_device *dev, const char *buf, size_t count) \
 { \
        struct cpu *cpu = container_of(dev, struct cpu, sysdev); \
@@ -440,12 +440,14 @@ int cpu_add_sysdev_attr_group(struct attribute_group *attrs)
 {
        int cpu;
        struct sys_device *sysdev;
+       int ret;
 
        mutex_lock(&cpu_mutex);
 
        for_each_possible_cpu(cpu) {
                sysdev = get_cpu_sysdev(cpu);
-               sysfs_create_group(&sysdev->kobj, attrs);
+               ret = sysfs_create_group(&sysdev->kobj, attrs);
+               WARN_ON(ret != 0);
        }
 
        mutex_unlock(&cpu_mutex);