From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Tue, 10 Dec 2013 15:22:01 -0800 From: tip-bot for Matthew Garrett Message-ID: Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org, matthew.garrett@nebula.com, stable@vger.kernel.org, matt.fleming@intel.com, tglx@linutronix.de, hpa@linux.intel.com Reply-To: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, matthew.garrett@nebula.com, stable@vger.kernel.org, matt.fleming@intel.com, tglx@linutronix.de, hpa@linux.intel.com In-Reply-To: <1385754283-2464-1-git-send-email-matthew.garrett@nebula.com> References: <1385754283-2464-1-git-send-email-matthew.garrett@nebula.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86, efi: Don't use (U) EFI time services on 32 bit MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: Commit-ID: 04bf9ba720fcc4fa313fa122b799ae0989b6cd50 Gitweb: http://git.kernel.org/tip/04bf9ba720fcc4fa313fa122b799ae0989b6cd50 Author: Matthew Garrett AuthorDate: Fri, 29 Nov 2013 14:44:43 -0500 Committer: H. Peter Anvin CommitDate: Tue, 10 Dec 2013 15:02:34 -0800 x86, efi: Don't use (U)EFI time services on 32 bit 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: Cc: Matt Fleming Signed-off-by: H. Peter Anvin --- arch/x86/platform/efi/efi.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 92c0234..cceb813 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -690,13 +690,6 @@ void __init efi_init(void) set_bit(EFI_MEMMAP, &x86_efi_facility); -#ifdef CONFIG_X86_32 - if (efi_is_native()) { - x86_platform.get_wallclock = efi_get_time; - x86_platform.set_wallclock = efi_set_rtc_mmss; - } -#endif - #if EFI_DEBUG print_efi_memmap(); #endif