summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-01-05 12:48:06 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-07 17:04:47 -0800
commit8564a6c140317de04a71eb203bdbb58845d69f9c (patch)
tree92a9044e3ea45ea25fb7ec0993f4a499c7625e63
parent1e395ab3d9b6aa09c5f0aa46a1b0a6fc5bd33133 (diff)
downloadlinux-3.10-8564a6c140317de04a71eb203bdbb58845d69f9c.tar.gz
linux-3.10-8564a6c140317de04a71eb203bdbb58845d69f9c.tar.bz2
linux-3.10-8564a6c140317de04a71eb203bdbb58845d69f9c.zip
sysdev: Fix type of sysdev class attribute in memory driver
This attribute is really a sysdev_class attribute, not a plain class attribute. They are identical in layout currently, but this might not always be the case. Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/base/memory.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index bd025059711..563656ad75a 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -309,17 +309,18 @@ static SYSDEV_ATTR(removable, 0444, show_mem_removable, NULL);
* Block size attribute stuff
*/
static ssize_t
-print_block_size(struct class *class, char *buf)
+print_block_size(struct sysdev_class *class, struct sysdev_class_attribute *attr,
+ char *buf)
{
return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
}
-static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
+static SYSDEV_CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
static int block_size_init(void)
{
return sysfs_create_file(&memory_sysdev_class.kset.kobj,
- &class_attr_block_size_bytes.attr);
+ &attr_block_size_bytes.attr);
}
/*