linux-kernel - [tip:x86/urgent] x86: Make EFI RTC function depend on 32bit again

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Tue, 27 Oct 2009 11:39:36 GMT
From:	tip-bot for Feng Tang <feng.tang@...el.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	mjg59@...f.ucam.org, tglx@...utronix.de, feng.tang@...el.com
Subject: [tip:x86/urgent] x86: Make EFI RTC function depend on 32bit again

Commit-ID:  772be899bc022ef2b911c3611b487d417e3269c3
Gitweb:     http://git.kernel.org/tip/772be899bc022ef2b911c3611b487d417e3269c3
Author:     Feng Tang <feng.tang@...el.com>
AuthorDate: Tue, 20 Oct 2009 12:54:02 +0800
Committer:  Thomas Gleixner <tglx@...utronix.de>
CommitDate: Tue, 27 Oct 2009 12:35:48 +0100

x86: Make EFI RTC function depend on 32bit again

The EFI RTC functions are only available on 32 bit. commit 7bd867df
(x86: Move get/set_wallclock to x86_platform_ops) removed the 32bit
dependency which leads to boot crashes on 64bit EFI systems.

Add the dependency back. 
Solves: http://bugzilla.kernel.org/show_bug.cgi?id=14466

Tested-by: Matthew Garrett <mjg59@...f.ucam.org>
Signed-off-by: Feng Tang <feng.tang@...el.com>
LKML-Reference: <20091020125402.028d66d5@...g-desktop>
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
 arch/x86/kernel/efi.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index ad5bd98..cdcfb12 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -454,8 +454,10 @@ void __init efi_init(void)
 	if (add_efi_memmap)
 		do_add_efi_memmap();
 
+#ifdef CONFIG_X86_32
 	x86_platform.get_wallclock = efi_get_time;
 	x86_platform.set_wallclock = efi_set_rtc_mmss;
+#endif
 
 	/* Setup for EFI runtime service */
 	reboot_type = BOOT_EFI;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/