diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-24 16:17:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-24 16:17:41 -0700 |
| commit | 7be141d0554921751db103b54e9f794956aa4f65 (patch) | |
| tree | b4355211d0000cfac547f1357104e62c96f3ac14 /arch/arm64/kernel/efi.c | |
| parent | 44744bb344abe032b387d361209038d2956e8c75 (diff) | |
| parent | 80b304fd00e8b667775ff791121b61ecd7cd0c03 (diff) | |
| download | linux-7be141d0554921751db103b54e9f794956aa4f65.tar.gz linux-7be141d0554921751db103b54e9f794956aa4f65.tar.bz2 linux-7be141d0554921751db103b54e9f794956aa4f65.zip | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A couple of EFI fixes, plus misc fixes all around the map"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm64: Store Runtime Services revision
firmware: Do not use WARN_ON(!spin_is_locked())
x86_32, entry: Clean up sysenter_badsys declaration
x86/doc: Fix the 'tlb_single_page_flush_ceiling' sysconfig path
x86/mm: Fix sparse 'tlb_single_page_flush_ceiling' warning and make the variable read-mostly
x86/mm: Fix RCU splat from new TLB tracepoints
Diffstat (limited to 'arch/arm64/kernel/efi.c')
| -rw-r--r-- | arch/arm64/kernel/efi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 24f0c6fb61d8..03aaa99e1ea0 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -465,6 +465,8 @@ static int __init arm64_enter_virtual_mode(void) efi_native_runtime_setup(); set_bit(EFI_RUNTIME_SERVICES, &efi.flags); + efi.runtime_version = efi.systab->hdr.revision; + return 0; err_unmap: |