Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts

[firefly-linux-kernel-4.4.55.git] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 7ed3ecfde98ab642eaf2dbbf21fb32d7e0d0277f..d62ec87a2b26d5d51bf2228ac7c2155cf9e8b06e 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -764,18 +764,11 @@ void __init efi_init(void)
                        return;
                set_bit(EFI_RUNTIME_SERVICES, &x86_efi_facility);
        }
-
        if (efi_memmap_init())
                return;
 
        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
        print_efi_memmap();
 }