77 lines
2.1 KiB
Diff
77 lines
2.1 KiB
Diff
|
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
|
||
|
|
index 3ae4128..e17c6d2 100644
|
||
|
|
--- a/arch/x86/platform/efi/efi.c
|
||
|
|
+++ b/arch/x86/platform/efi/efi.c
|
||
|
|
@@ -89,50 +89,26 @@ early_param("add_efi_memmap", setup_add_efi_memmap);
|
||
|
|
|
||
|
|
static efi_status_t virt_efi_get_time(efi_time_t *tm, efi_time_cap_t *tc)
|
||
|
|
{
|
||
|
|
- unsigned long flags;
|
||
|
|
- efi_status_t status;
|
||
|
|
-
|
||
|
|
- spin_lock_irqsave(&rtc_lock, flags);
|
||
|
|
- status = efi_call_virt2(get_time, tm, tc);
|
||
|
|
- spin_unlock_irqrestore(&rtc_lock, flags);
|
||
|
|
- return status;
|
||
|
|
+ return efi_call_virt2(get_time, tm, tc);
|
||
|
|
}
|
||
|
|
|
||
|
|
static efi_status_t virt_efi_set_time(efi_time_t *tm)
|
||
|
|
{
|
||
|
|
- unsigned long flags;
|
||
|
|
- efi_status_t status;
|
||
|
|
-
|
||
|
|
- spin_lock_irqsave(&rtc_lock, flags);
|
||
|
|
- status = efi_call_virt1(set_time, tm);
|
||
|
|
- spin_unlock_irqrestore(&rtc_lock, flags);
|
||
|
|
- return status;
|
||
|
|
+ return efi_call_virt1(set_time, tm);
|
||
|
|
}
|
||
|
|
|
||
|
|
static efi_status_t virt_efi_get_wakeup_time(efi_bool_t *enabled,
|
||
|
|
efi_bool_t *pending,
|
||
|
|
efi_time_t *tm)
|
||
|
|
{
|
||
|
|
- unsigned long flags;
|
||
|
|
- efi_status_t status;
|
||
|
|
-
|
||
|
|
- spin_lock_irqsave(&rtc_lock, flags);
|
||
|
|
- status = efi_call_virt3(get_wakeup_time,
|
||
|
|
- enabled, pending, tm);
|
||
|
|
- spin_unlock_irqrestore(&rtc_lock, flags);
|
||
|
|
- return status;
|
||
|
|
+ return efi_call_virt3(get_wakeup_time,
|
||
|
|
+ enabled, pending, tm);
|
||
|
|
}
|
||
|
|
|
||
|
|
static efi_status_t virt_efi_set_wakeup_time(efi_bool_t enabled, efi_time_t *tm)
|
||
|
|
{
|
||
|
|
- unsigned long flags;
|
||
|
|
- efi_status_t status;
|
||
|
|
-
|
||
|
|
- spin_lock_irqsave(&rtc_lock, flags);
|
||
|
|
- status = efi_call_virt2(set_wakeup_time,
|
||
|
|
- enabled, tm);
|
||
|
|
- spin_unlock_irqrestore(&rtc_lock, flags);
|
||
|
|
- return status;
|
||
|
|
+ return efi_call_virt2(set_wakeup_time,
|
||
|
|
+ enabled, tm);
|
||
|
|
}
|
||
|
|
|
||
|
|
static efi_status_t virt_efi_get_variable(efi_char16_t *name,
|
||
|
|
@@ -232,14 +208,11 @@ static efi_status_t __init phys_efi_set_virtual_address_map(
|
||
|
|
static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
|
||
|
|
efi_time_cap_t *tc)
|
||
|
|
{
|
||
|
|
- unsigned long flags;
|
||
|
|
efi_status_t status;
|
||
|
|
|
||
|
|
- spin_lock_irqsave(&rtc_lock, flags);
|
||
|
|
efi_call_phys_prelog();
|
||
|
|
status = efi_call_phys2(efi_phys.get_time, tm, tc);
|
||
|
|
efi_call_phys_epilog();
|
||
|
|
- spin_unlock_irqrestore(&rtc_lock, flags);
|
||
|
|
return status;
|
||
|
|
}
|
||
|
|
|