1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 855ed1a9f97b..af0d175c025d 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -103,7 +103,8 @@ static ssize_t show_mem_phys_index(struct sys_device *dev,
 /*
  * Show whether the section of memory is likely to be hot-removable
  */
-static ssize_t show_mem_removable(struct sys_device *dev, char *buf)
+static ssize_t show_mem_removable(struct sys_device *dev,
+                        struct sysdev_attribute *attr, char *buf)
 {
         unsigned long start_pfn;
         int ret;
@@ -204,9 +205,8 @@ memory_block_action(struct memory_block *mem, unsigned long action)
                         }
                         break;
                 default:
-                        printk(KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
+                        WARN(1, KERN_WARNING "%s(%p, %ld) unknown action: %ld\n",
                                         __func__, mem, action, action);
-                        WARN_ON(1);
                         ret = -EINVAL;
         }