summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorChristoph Fritz <chf.fritz@googlemail.com>2011-11-28 23:49:33 +0100
committerTony Luck <tony.luck@intel.com>2011-11-29 00:33:32 +0100
commiteee628da2ee3cbba6f14696278c92a464239eea6 (patch)
treed66440dd23e30649cf34ba61d360a4fd0f4c51e0 /drivers/firmware
parentpstore: pass allocated memory region back to caller (diff)
downloadlinux-eee628da2ee3cbba6f14696278c92a464239eea6.tar.xz
linux-eee628da2ee3cbba6f14696278c92a464239eea6.zip
efivars: add missing parameter to efi_pstore_read()
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". problem introduced in commit f6f8285132907757ef84ef8dae0a1244b8cde6ac Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/efivars.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index a54a6b972ced..b0a81173a268 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;
}