diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-14 14:18:50 +0800 |
commit | 5af6a242945e39bf6ea39716d4eba316b735dce8 (patch) | |
tree | 35363a04680e1618f6ed1c2b4eafbbc3d59ef048 /arch/x86/platform/efi/efi.c | |
parent | 7eff2ffe05a8b2c6c83a4f511ac6c31c858e3048 (diff) | |
parent | 34e0913e457f8469667faf5fa600447aa93371cf (diff) |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'arch/x86/platform/efi/efi.c')
-rw-r--r-- | arch/x86/platform/efi/efi.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index 711e0ce95b51..b045f9e109db 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -237,12 +237,19 @@ static efi_status_t __init phys_efi_set_virtual_address_map( efi_memory_desc_t *virtual_map) { efi_status_t status; + unsigned long flags; efi_call_phys_prelog(); + + /* Disable interrupts around EFI calls: */ + local_irq_save(flags); status = efi_call_phys4(efi_phys.set_virtual_address_map, memory_map_size, descriptor_size, descriptor_version, virtual_map); + local_irq_restore(flags); + efi_call_phys_epilog(); + return status; } |