From: tip-bot for Matthew Garrett <mjg@redhat.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, mjg@redhat.com, hpa@zytor.com,
mingo@redhat.com, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/efi] x86, efi: Fix argument types for SetVariable()
Date: Mon, 6 Jun 2011 21:21:58 GMT [thread overview]
Message-ID: <tip-f7a2d73fe75c71941fb0a6b4d8fe7da8144f2c7b@git.kernel.org> (raw)
In-Reply-To: <1307388985-7852-1-git-send-email-mjg@redhat.com>
Commit-ID: f7a2d73fe75c71941fb0a6b4d8fe7da8144f2c7b
Gitweb: http://git.kernel.org/tip/f7a2d73fe75c71941fb0a6b4d8fe7da8144f2c7b
Author: Matthew Garrett <mjg@redhat.com>
AuthorDate: Mon, 6 Jun 2011 15:36:24 -0400
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 6 Jun 2011 13:30:27 -0700
x86, efi: Fix argument types for SetVariable()
The spec says this takes uint32 for attributes, not uintn.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Link: http://lkml.kernel.org/r/1307388985-7852-1-git-send-email-mjg@redhat.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/platform/efi/efi.c | 2 +-
include/linux/efi.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 0d3a4fa..f4f6de9 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -122,7 +122,7 @@ static efi_status_t virt_efi_get_next_variable(unsigned long *name_size,
static efi_status_t virt_efi_set_variable(efi_char16_t *name,
efi_guid_t *vendor,
- unsigned long attr,
+ u32 attr,
unsigned long data_size,
void *data)
{
diff --git a/include/linux/efi.h b/include/linux/efi.h
index e376270..0758753 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -168,7 +168,7 @@ typedef efi_status_t efi_get_variable_t (efi_char16_t *name, efi_guid_t *vendor,
typedef efi_status_t efi_get_next_variable_t (unsigned long *name_size, efi_char16_t *name,
efi_guid_t *vendor);
typedef efi_status_t efi_set_variable_t (efi_char16_t *name, efi_guid_t *vendor,
- unsigned long attr, unsigned long data_size,
+ u32 attr, unsigned long data_size,
void *data);
typedef efi_status_t efi_get_next_high_mono_count_t (u32 *count);
typedef void efi_reset_system_t (int reset_type, efi_status_t status,
next prev parent reply other threads:[~2011-06-06 21:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-06 19:36 [PATCH 1/2] efi: Fix argument types for SetVariable() Matthew Garrett
2011-06-06 19:36 ` [PATCH 2/2] efi: Add infrastructure for UEFI 2.0 runtime services Matthew Garrett
2011-06-06 21:22 ` [tip:x86/efi] x86, " tip-bot for Matthew Garrett
2011-06-20 22:42 ` [PATCH 2/2] " Mike Waychison
2011-06-20 22:44 ` Mike Waychison
2011-06-21 15:02 ` Matthew Garrett
2011-06-06 21:21 ` tip-bot for Matthew Garrett [this message]
2011-06-09 19:02 ` [PATCH 1/2] efi: Fix argument types for SetVariable() Tony Luck
2011-06-09 19:09 ` Matthew Garrett
2011-07-06 20:48 ` [PATCH v2] " Matthew Garrett
2011-07-06 21:36 ` Luck, Tony
2011-07-07 9:33 ` Ingo Molnar
2011-07-07 11:38 ` Matthew Garrett
2011-07-07 11:40 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-f7a2d73fe75c71941fb0a6b4d8fe7da8144f2c7b@git.kernel.org \
--to=mjg@redhat.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).