diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-27 10:51:02 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-28 02:30:50 -0400 |
commit | 3cee67f77922721e90c1573d84c07e18c5508713 (patch) | |
tree | 7b82beea9cf932f18239c3b81ba7a9c216cbd507 /arch/powerpc/platforms/pseries/cmm.c | |
parent | dec2b0d0cc64e495a3c9c5700fa7a3b397b5e855 (diff) |
powerpc/pseries: Fix CMO sysdev attribute API change fallout
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>
Diffstat (limited to 'arch/powerpc/platforms/pseries/cmm.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/cmm.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index c6b3be03168b..38fe32a7cc70 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c | |||
@@ -289,7 +289,9 @@ static int cmm_thread(void *dummy) | |||
289 | } | 289 | } |
290 | 290 | ||
291 | #define CMM_SHOW(name, format, args...) \ | 291 | #define CMM_SHOW(name, format, args...) \ |
292 | static ssize_t show_##name(struct sys_device *dev, char *buf) \ | 292 | static ssize_t show_##name(struct sys_device *dev, \ |
293 | struct sysdev_attribute *attr, \ | ||
294 | char *buf) \ | ||
293 | { \ | 295 | { \ |
294 | return sprintf(buf, format, ##args); \ | 296 | return sprintf(buf, format, ##args); \ |
295 | } \ | 297 | } \ |
@@ -298,12 +300,14 @@ static int cmm_thread(void *dummy) | |||
298 | CMM_SHOW(loaned_kb, "%lu\n", PAGES2KB(loaned_pages)); | 300 | CMM_SHOW(loaned_kb, "%lu\n", PAGES2KB(loaned_pages)); |
299 | CMM_SHOW(loaned_target_kb, "%lu\n", PAGES2KB(loaned_pages_target)); | 301 | CMM_SHOW(loaned_target_kb, "%lu\n", PAGES2KB(loaned_pages_target)); |
300 | 302 | ||
301 | static ssize_t show_oom_pages(struct sys_device *dev, char *buf) | 303 | static ssize_t show_oom_pages(struct sys_device *dev, |
304 | struct sysdev_attribute *attr, char *buf) | ||
302 | { | 305 | { |
303 | return sprintf(buf, "%lu\n", PAGES2KB(oom_freed_pages)); | 306 | return sprintf(buf, "%lu\n", PAGES2KB(oom_freed_pages)); |
304 | } | 307 | } |
305 | 308 | ||
306 | static ssize_t store_oom_pages(struct sys_device *dev, | 309 | static ssize_t store_oom_pages(struct sys_device *dev, |
310 | struct sysdev_attribute *attr, | ||
307 | const char *buf, size_t count) | 311 | const char *buf, size_t count) |
308 | { | 312 | { |
309 | unsigned long val = simple_strtoul (buf, NULL, 10); | 313 | unsigned long val = simple_strtoul (buf, NULL, 10); |