[PATCH] efivars: add missing parameter to efi_pstore_read()

[PATCH] efivars: add missing parameter to efi_pstore_read()

[Christoph Fritz]

In the case where CONFIG_PSTORE=n, the function efi_pstore_read() doesn't
have the correct list of parameters. This patch provides a definition
of efi_pstore_read() with 'char **buf' added to fix this warning:
"drivers/firmware/efivars.c:609: warning: initialization from".

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
---
 drivers/firmware/efivars.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index a54a6b9..b0a8117 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -581,7 +581,8 @@ static int efi_pstore_close(struct pstore_info *psi)
 }
 
 static ssize_t efi_pstore_read(u64 *id, enum pstore_type_id *type,
-			       struct timespec *time, struct pstore_info *psi)
+			       struct timespec *timespec,
+			       char **buf, struct pstore_info *psi)
 {
 	return -1;
 }
-- 
1.7.2.5

Re: [PATCH] efivars: add missing parameter to efi_pstore_read()

[Tony Luck]

On Mon, Nov 28, 2011 at 2:49 PM, Christoph Fritz
<chf.fritz@googlemail.com> wrote:
> In the case where CONFIG_PSTORE=n, the function efi_pstore_read() doesn't
> have the correct list of parameters. This patch provides a definition
> of efi_pstore_read() with 'char **buf' added to fix this warning:
> "drivers/firmware/efivars.c:609: warning: initialization from".

Thanks.  Will ask Linus to pull from my tree soon - but if someone
else pushes it consider it:

Acked-by: Tony Luck <tony.luck@intel.com>

-Tony

[This has been broken in linux-next for over a week - I guess all
linux-next builders have PSTORE=y]