diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-29 19:32:09 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-29 19:32:09 +0800 |
| commit | a7211bc9f3d50d77efe77c332b269458a94fcfd2 (patch) | |
| tree | 7706737cdba1e29534a31c3055942e71ea74bce1 /arch/x86 | |
| parent | 2407e486066b8ce00dabd7e2b3a2cbcc59ea6186 (diff) | |
| parent | 48c7d73b2362ce61503551ad70052617b3e8857d (diff) | |
| download | linux-a7211bc9f3d50d77efe77c332b269458a94fcfd2.tar.bz2 | |
Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI fixes from Ingo Molnar:
"Four fixes:
- fix a kexec crash on arm64
- fix a reboot crash on some Android platforms
- future-proof the code for upcoming ACPI 6.2 changes
- fix a build warning on x86"
* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efibc: Replace variable set function in notifier call
x86/efi: fix a -Wtype-limits compilation warning
efi/bgrt: Drop BGRT status field reserved bits check
efi/memreserve: deal with memreserve entries in unmapped memory
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/platform/efi/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/quirks.c b/arch/x86/platform/efi/quirks.c index 632b83885867..3b9fd679cea9 100644 --- a/arch/x86/platform/efi/quirks.c +++ b/arch/x86/platform/efi/quirks.c @@ -728,7 +728,7 @@ void efi_recover_from_page_fault(unsigned long phys_addr) * Address range 0x0000 - 0x0fff is always mapped in the efi_pgd, so * page faulting on these addresses isn't expected. */ - if (phys_addr >= 0x0000 && phys_addr <= 0x0fff) + if (phys_addr <= 0x0fff) return; /* |