Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updates from Ingo Molnar: "UV platform updates (with a 'hubless' variant) and Jailhouse updates for better UART support" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/jailhouse: Only enable platform UARTs if available x86/jailhouse: Improve setup data version comparison x86/platform/uv: Account for UV Hubless in is_uvX_hub Ops x86/platform/uv: Check EFI Boot to set reboot type x86/platform/uv: Decode UVsystab Info x86/platform/uv: Add UV Hubbed/Hubless Proc FS Files x86/platform/uv: Setup UV functions for Hubless UV Systems x86/platform/uv: Add return code to UV BIOS Init function x86/platform/uv: Return UV Hubless System Type x86/platform/uv: Save OEM_ID from ACPI MADT probe
Showing
- arch/x86/include/asm/uv/bios.h 1 addition, 1 deletionarch/x86/include/asm/uv/bios.h
- arch/x86/include/asm/uv/uv.h 14 additions, 2 deletionsarch/x86/include/asm/uv/uv.h
- arch/x86/include/asm/uv/uv_hub.h 20 additions, 41 deletionsarch/x86/include/asm/uv/uv_hub.h
- arch/x86/include/uapi/asm/bootparam.h 16 additions, 9 deletionsarch/x86/include/uapi/asm/bootparam.h
- arch/x86/kernel/apic/x2apic_uv_x.c 163 additions, 21 deletionsarch/x86/kernel/apic/x2apic_uv_x.c
- arch/x86/kernel/jailhouse.c 104 additions, 32 deletionsarch/x86/kernel/jailhouse.c
- arch/x86/platform/uv/bios_uv.c 5 additions, 4 deletionsarch/x86/platform/uv/bios_uv.c
Please register or sign in to comment