diff options
author | Matthew Garrett <matthew.garrett@nebula.com> | 2013-11-29 14:44:43 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-20 10:45:10 -0500 |
commit | eea588a497c56a7ed72e00a71829118f465efe39 (patch) | |
tree | 4c05559370d0f115363ba41fa2c694c04b560ff8 | |
parent | d7b2643fc9a596037084830b157a559d8f870169 (diff) |
x86, efi: Don't use (U)EFI time services on 32 bit
commit 04bf9ba720fcc4fa313fa122b799ae0989b6cd50 upstream.
UEFI time services are often broken once we're in virtual mode. We were
already refusing to use them on 64-bit systems, but it turns out that
they're also broken on some 32-bit firmware, including the Dell Venue.
Disable them for now, we can revisit once we have the 1:1 mappings code
incorporated.
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
Link: http://lkml.kernel.org/r/1385754283-2464-1-git-send-email-matthew.garrett@nebula.com
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | arch/x86/platform/efi/efi.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 91ac654ff4ea..3474a2ccd8b1 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
@@ -766,13 +766,6 @@ void __init efi_init(void) | |||
766 | 766 | ||
767 | set_bit(EFI_MEMMAP, &x86_efi_facility); | 767 | set_bit(EFI_MEMMAP, &x86_efi_facility); |
768 | 768 | ||
769 | #ifdef CONFIG_X86_32 | ||
770 | if (efi_is_native()) { | ||
771 | x86_platform.get_wallclock = efi_get_time; | ||
772 | x86_platform.set_wallclock = efi_set_rtc_mmss; | ||
773 | } | ||
774 | #endif | ||
775 | |||
776 | #if EFI_DEBUG | 769 | #if EFI_DEBUG |
777 | print_efi_memmap(); | 770 | print_efi_memmap(); |
778 | #endif | 771 | #endif |