2008-07-27 04:26:52

by Nathan Lynch

[permalink] [raw]
Subject: [PATCH] drivers/base/memory.c: fix fallout from sysdev API changes

drivers/base/memory.c:280: warning: initialization from incompatible pointer type

Signed-off-by: Nathan Lynch <[email protected]>
---
drivers/base/memory.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index 3ad49a0..af0d175 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;
--
1.5.6.2


2008-07-27 13:18:13

by Andi Kleen

[permalink] [raw]
Subject: Re: [PATCH] drivers/base/memory.c: fix fallout from sysdev API changes

On Sat, Jul 26, 2008 at 11:26:34PM -0500, Nathan Lynch wrote:
> drivers/base/memory.c:280: warning: initialization from incompatible pointer type

Thanks looks good. I assume Andrew or Greg will merge it.

-Andi