Merge tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[cascardo/linux.git] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 56400d0..1fbb408 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -97,21 +97,6 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
        return status;
 }
 
-void efi_get_time(struct timespec *now)
-{
-       efi_status_t status;
-       efi_time_t eft;
-       efi_time_cap_t cap;
-
-       status = efi.get_time(&eft, &cap);
-       if (status != EFI_SUCCESS)
-               pr_err("Oops: efitime: can't read time!\n");
-
-       now->tv_sec = mktime(eft.year, eft.month, eft.day, eft.hour,
-                            eft.minute, eft.second);
-       now->tv_nsec = 0;
-}
-
 void __init efi_find_mirror(void)
 {
        efi_memory_desc_t *md;
@@ -977,8 +962,6 @@ static void __init __efi_enter_virtual_mode(void)
         * EFI mixed mode we need all of memory to be accessible when
         * we pass parameters to the EFI runtime services in the
         * thunking code.
-        *
-        * efi_cleanup_page_tables(__pa(new_memmap), 1 << pg_shift);
         */
        free_pages((unsigned long)new_memmap, pg_shift);