[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110803181524.6b7062d1.rdunlap@xenotime.net>
Date: Wed, 3 Aug 2011 18:15:24 -0700
From: Randy Dunlap <rdunlap@...otime.net>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>,
Matthew Garrett <mjg@...hat.com>,
Tony Luck <tony.luck@...el.com>
Subject: [PATCH -next] efivars: fix build warning when PSTORE is not enabled
On Thu, 4 Aug 2011 10:49:27 +1000 Stephen Rothwell wrote:
> Hi Randy,
>
> On Wed, 3 Aug 2011 10:40:30 -0700 Randy Dunlap <rdunlap@...otime.net> wrote:
> >
> > What is this warning about? I don't see the problem.
> >
> > The warning only happens on i386 AFAIK. Must be some typedef glitch?
> >
> > drivers/firmware/efivars.c:602: warning: initialization from incompatible pointer type
>
> The second argument to the write method in a pstore_info is supposed to
> be "unsigned int" but the assigned function has "int" in the
> !CONFIG_PSTORE version.
Dang, I missed that second version of the write function. Thanks.
---
From: Randy Dunlap <rdunlap@...otime.net>
Fix efivars.c build warning when CONFIG_PSTORE is not enabled:
drivers/firmware/efivars.c:602: warning: initialization from incompatible pointer type
Signed-off-by: Randy Dunlap <rdunlap@...otime.net>
Cc: matthew.e.tolentino@...el.com
---
drivers/firmware/efivars.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20110803.orig/drivers/firmware/efivars.c
+++ linux-next-20110803/drivers/firmware/efivars.c
@@ -580,8 +580,8 @@ static ssize_t efi_pstore_read(u64 *id,
return -1;
}
-static u64 efi_pstore_write(enum pstore_type_id type, int part, size_t size,
- struct pstore_info *psi)
+static u64 efi_pstore_write(enum pstore_type_id type, unsigned int part,
+ size_t size, struct pstore_info *psi)
{
return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists