Merge branch 'core-v28-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / pseries / cmm.c

diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index c6b3be03168bf7bc72fd2e190a71352e87f7a6a9..5cd4d276162085f43177ac56d7effb162dcdb090 100644 (file)
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr)
                        npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |
                                                                       __GFP_NORETRY | __GFP_NOMEMALLOC);
                        if (!npa) {
-                               pr_info("%s: Can not allocate new page list\n", __FUNCTION__);
+                               pr_info("%s: Can not allocate new page list\n", __func__);
                                free_page(addr);
                                break;
                        }
@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr)
                }
 
                if ((rc = plpar_page_set_loaned(__pa(addr)))) {
-                       pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc);
+                       pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc);
                        spin_unlock(&cmm_lock);
                        free_page(addr);
                        break;
@@ -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);