diff options
Diffstat (limited to 'arch/x86/platform/efi/efi.c')
-rw-r--r-- | arch/x86/platform/efi/efi.c | 30 |
1 files changed, 4 insertions, 26 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 92660edaa1e7..2dc29f51e75a 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c | |||
@@ -234,22 +234,7 @@ static efi_status_t __init phys_efi_set_virtual_address_map( | |||
234 | return status; | 234 | return status; |
235 | } | 235 | } |
236 | 236 | ||
237 | static efi_status_t __init phys_efi_get_time(efi_time_t *tm, | 237 | static int efi_set_rtc_mmss(unsigned long nowtime) |
238 | efi_time_cap_t *tc) | ||
239 | { | ||
240 | unsigned long flags; | ||
241 | efi_status_t status; | ||
242 | |||
243 | spin_lock_irqsave(&rtc_lock, flags); | ||
244 | efi_call_phys_prelog(); | ||
245 | status = efi_call_phys2(efi_phys.get_time, virt_to_phys(tm), | ||
246 | virt_to_phys(tc)); | ||
247 | efi_call_phys_epilog(); | ||
248 | spin_unlock_irqrestore(&rtc_lock, flags); | ||
249 | return status; | ||
250 | } | ||
251 | |||
252 | int efi_set_rtc_mmss(unsigned long nowtime) | ||
253 | { | 238 | { |
254 | int real_seconds, real_minutes; | 239 | int real_seconds, real_minutes; |
255 | efi_status_t status; | 240 | efi_status_t status; |
@@ -278,7 +263,7 @@ int efi_set_rtc_mmss(unsigned long nowtime) | |||
278 | return 0; | 263 | return 0; |
279 | } | 264 | } |
280 | 265 | ||
281 | unsigned long efi_get_time(void) | 266 | static unsigned long efi_get_time(void) |
282 | { | 267 | { |
283 | efi_status_t status; | 268 | efi_status_t status; |
284 | efi_time_t eft; | 269 | efi_time_t eft; |
@@ -621,18 +606,13 @@ static int __init efi_runtime_init(void) | |||
621 | } | 606 | } |
622 | /* | 607 | /* |
623 | * We will only need *early* access to the following | 608 | * We will only need *early* access to the following |
624 | * two EFI runtime services before set_virtual_address_map | 609 | * EFI runtime service before set_virtual_address_map |
625 | * is invoked. | 610 | * is invoked. |
626 | */ | 611 | */ |
627 | efi_phys.get_time = (efi_get_time_t *)runtime->get_time; | ||
628 | efi_phys.set_virtual_address_map = | 612 | efi_phys.set_virtual_address_map = |
629 | (efi_set_virtual_address_map_t *) | 613 | (efi_set_virtual_address_map_t *) |
630 | runtime->set_virtual_address_map; | 614 | runtime->set_virtual_address_map; |
631 | /* | 615 | |
632 | * Make efi_get_time can be called before entering | ||
633 | * virtual mode. | ||
634 | */ | ||
635 | efi.get_time = phys_efi_get_time; | ||
636 | early_iounmap(runtime, sizeof(efi_runtime_services_t)); | 616 | early_iounmap(runtime, sizeof(efi_runtime_services_t)); |
637 | 617 | ||
638 | return 0; | 618 | return 0; |
@@ -720,12 +700,10 @@ void __init efi_init(void) | |||
720 | efi_enabled = 0; | 700 | efi_enabled = 0; |
721 | return; | 701 | return; |
722 | } | 702 | } |
723 | #ifdef CONFIG_X86_32 | ||
724 | if (efi_native) { | 703 | if (efi_native) { |
725 | x86_platform.get_wallclock = efi_get_time; | 704 | x86_platform.get_wallclock = efi_get_time; |
726 | x86_platform.set_wallclock = efi_set_rtc_mmss; | 705 | x86_platform.set_wallclock = efi_set_rtc_mmss; |
727 | } | 706 | } |
728 | #endif | ||
729 | 707 | ||
730 | #if EFI_DEBUG | 708 | #if EFI_DEBUG |
731 | print_efi_memmap(); | 709 | print_efi_memmap(); |