From: Matthew Garrett Date: Fri, 29 Nov 2013 19:44:43 +0000 (-0500) Subject: x86, efi: Don't use (U)EFI time services on 32 bit X-Git-Tag: v3.2.54~52 X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=d7b05fbb31ac1c454c5bbf303da75b3e1810de51;p=unionfs-2.6.39.y.git 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 Link: http://lkml.kernel.org/r/1385754283-2464-1-git-send-email-matthew.garrett@nebula.com Cc: Matt Fleming Signed-off-by: H. Peter Anvin [bwh: Backported to 3.2: deleted code is slightly different] Signed-off-by: Ben Hutchings --- diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index a18d20d5274..bee75a6052a 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -614,11 +614,6 @@ void __init efi_init(void) set_bit(EFI_MEMMAP, &x86_efi_facility); -#ifdef CONFIG_X86_32 - x86_platform.get_wallclock = efi_get_time; - x86_platform.set_wallclock = efi_set_rtc_mmss; -#endif - #if EFI_DEBUG print_efi_memmap(); #endif