diff options
| author | Feng Tang <feng.tang@intel.com> | 2009-10-20 12:54:02 +0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-10-27 12:35:48 +0100 |
| commit | 772be899bc022ef2b911c3611b487d417e3269c3 (patch) | |
| tree | 911d243c13b1ded8ff6f62ccbe70e4570cca24ec /arch/x86 | |
| parent | 81766741fe1eee3884219e8daaf03f466f2ed52f (diff) | |
| download | linux-772be899bc022ef2b911c3611b487d417e3269c3.tar.gz linux-772be899bc022ef2b911c3611b487d417e3269c3.tar.bz2 linux-772be899bc022ef2b911c3611b487d417e3269c3.zip | |
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@srcf.ucam.org>
Signed-off-by: Feng Tang <feng.tang@intel.com>
LKML-Reference: <20091020125402.028d66d5@feng-desktop>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | 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 ad5bd988fb79..cdcfb122f256 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; |