diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-20 12:31:14 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-20 12:31:14 +0200 |
commit | 4fe34d61a3a9d9ed954cbc90713506a7598d6b36 (patch) | |
tree | d21e865c1233b50a2f26ab995e46037df78fa126 /drivers/net/ethernet/natsemi/ibmlana.c | |
parent | Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | x86/boot/acpi: Move get_cmdline_acpi_rsdp() under #ifdef guard (diff) | |
download | linux-4fe34d61a3a9d9ed954cbc90713506a7598d6b36.tar.xz linux-4fe34d61a3a9d9ed954cbc90713506a7598d6b36.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"A small set of x86 fixes:
- Prevent a NULL pointer dereference in the X2APIC code in case of a
CPU hotplug failure.
- Prevent boot failures on HP superdome machines by invalidating the
level2 kernel pagetable entries outside of the kernel area as
invalid so BIOS reserved space won't be touched unintentionally.
Also ensure that memory holes are rounded up to the next PMD
boundary correctly.
- Enable X2APIC support on Hyper-V to prevent boot failures.
- Set the paravirt name when running on Hyper-V for consistency
- Move a function under the appropriate ifdef guard to prevent build
warnings"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/boot/acpi: Move get_cmdline_acpi_rsdp() under #ifdef guard
x86/hyperv: Set pv_info.name to "Hyper-V"
x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu
x86/hyperv: Make vapic support x2apic mode
x86/boot/64: Round memory hole size up to next PMD page
x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area
Diffstat (limited to 'drivers/net/ethernet/natsemi/ibmlana.c')
0 files changed, 0 insertions, 0 deletions