summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-25 10:07:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-03 18:24:42 -0600
commit40913e0adeb733053017293b0a5d6e096e47e4a1 (patch)
tree7b82d2407f3f275788b3147eff50dcf740543f51
parent956b0310a4f4cb0777d1e8a11a23950ec111a13b (diff)
downloadlinux-3.10-40913e0adeb733053017293b0a5d6e096e47e4a1.tar.gz
linux-3.10-40913e0adeb733053017293b0a5d6e096e47e4a1.tar.bz2
linux-3.10-40913e0adeb733053017293b0a5d6e096e47e4a1.zip
x86, efi: Set runtime_version to the EFI spec revision
commit 712ba9e9afc4b3d3d6fa81565ca36fe518915c01 upstream. efi.runtime_version is erroneously being set to the value of the vendor's firmware revision instead of that of the implemented EFI specification. We can't deduce which EFI functions are available based on the revision of the vendor's firmware since the version scheme is likely to be unique to each vendor. What we really need to know is the revision of the implemented EFI specification, which is available in the EFI System Table header. Signed-off-by: Matt Fleming <matt.fleming@intel.com> Cc: Seiji Aguchi <seiji.aguchi@hds.com> Cc: Matthew Garrett <mjg59@srcf.ucam.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/platform/efi/efi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 72d88992f38..6825327d00a 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -900,7 +900,7 @@ void __init efi_enter_virtual_mode(void)
*
* Call EFI services through wrapper functions.
*/
- efi.runtime_version = efi_systab.fw_revision;
+ efi.runtime_version = efi_systab.hdr.revision;
efi.get_time = virt_efi_get_time;
efi.set_time = virt_efi_set_time;
efi.get_wakeup_time = virt_efi_get_wakeup_time;