]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc/pseries: Fix CMO sysdev attribute API change fallout
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 27 Jul 2008 14:51:02 +0000 (00:51 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 28 Jul 2008 06:30:50 +0000 (16:30 +1000)
Noticed due to these wanings:

arch/powerpc/platforms/pseries/cmm.c:298: warning: initialization from incompatible pointer type
arch/powerpc/platforms/pseries/cmm.c:299: warning: initialization from incompatible pointer type
arch/powerpc/platforms/pseries/cmm.c:320: warning: initialization from incompatible pointer type
arch/powerpc/platforms/pseries/cmm.c:320: warning: initialization from incompatible pointer type

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/pseries/cmm.c

index c6b3be03168bf7bc72fd2e190a71352e87f7a6a9..38fe32a7cc7007b2c3a24a5ed688db7c1a9d7dd2 100644 (file)
@@ -289,7 +289,9 @@ static int cmm_thread(void *dummy)
 }
 
 #define CMM_SHOW(name, format, args...)                        \
-       static ssize_t show_##name(struct sys_device *dev, char *buf)   \
+       static ssize_t show_##name(struct sys_device *dev,      \
+                                  struct sysdev_attribute *attr,       \
+                                  char *buf)                   \
        {                                                       \
                return sprintf(buf, format, ##args);            \
        }                                                       \
@@ -298,12 +300,14 @@ static int cmm_thread(void *dummy)
 CMM_SHOW(loaned_kb, "%lu\n", PAGES2KB(loaned_pages));
 CMM_SHOW(loaned_target_kb, "%lu\n", PAGES2KB(loaned_pages_target));
 
-static ssize_t show_oom_pages(struct sys_device *dev, char *buf)
+static ssize_t show_oom_pages(struct sys_device *dev,
+                             struct sysdev_attribute *attr, char *buf)
 {
        return sprintf(buf, "%lu\n", PAGES2KB(oom_freed_pages));
 }
 
 static ssize_t store_oom_pages(struct sys_device *dev,
+                              struct sysdev_attribute *attr,
                               const char *buf, size_t count)
 {
        unsigned long val = simple_strtoul (buf, NULL, 10);