lkml.org 
[lkml]   [2009]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    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@intel.com>
    AuthorDate: Tue, 20 Oct 2009 12:54:02 +0800
    Committer: Thomas Gleixner <tglx@linutronix.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@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>
    ---
    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;

    \
     
     \ /
      Last update: 2009-10-27 12:43    [W:0.023 / U:0.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site