Messages in this thread | | | Date | Mon, 13 Nov 2017 09:37:47 +0100 | From | Ingo Molnar <> | Subject | [GIT PULL] x86/platform changes for v4.15 |
| |
Linus,
Please pull the latest x86-platform-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus
# HEAD: 418492ba40b2c2bbdaf1a169aac5b1673bde8189 x86/virt/xen: Use guest_late_init to detect Xen PVH guest
The main changes in this cycle were:
- A refactoring of the early virt init code by merging 'struct x86_hyper' into 'struct x86_platform' and 'struct x86_init', which allows simplifications and also the addition of a new ->guest_late_init() callback. (Juergen Gross)
- timer_setup() conversion of the UV code (Kees Cook)
out-of-topic modifications in x86-platform-for-linus: ------------------------------------------------------- drivers/hv/vmbus_drv.c # 03b2a320b19f: x86/virt: Add enum for hyper drivers/input/mouse/vmmouse.c # 03b2a320b19f: x86/virt: Add enum for hyper drivers/misc/vmw_balloon.c # 03b2a320b19f: x86/virt: Add enum for hyper include/linux/hypervisor.h # f72e38e8ec88: x86/virt, x86/platform: Merg
Thanks,
Ingo
------------------> Juergen Gross (5): x86/virt, x86/platform: Merge 'struct x86_hyper' into 'struct x86_platform' and 'struct x86_init' x86/virt: Add enum for hypervisors to replace x86_hyper x86/virt, x86/acpi: Add test for ACPI_FADT_NO_VGA x86/virt, x86/platform: Add ->guest_late_init() callback to hypervisor_x86 structure x86/virt/xen: Use guest_late_init to detect Xen PVH guest
Kees Cook (1): x86/platform/UV: Convert timers to use timer_setup()
arch/x86/hyperv/hv_init.c | 2 +- arch/x86/include/asm/hypervisor.h | 46 +++++++++++---------------- arch/x86/include/asm/kvm_para.h | 2 -- arch/x86/include/asm/x86_init.h | 27 ++++++++++++++++ arch/x86/kernel/acpi/boot.c | 5 +++ arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/x2apic_uv_x.c | 5 ++- arch/x86/kernel/cpu/hypervisor.c | 64 ++++++++++++++++++++------------------ arch/x86/kernel/cpu/mshyperv.c | 6 ++-- arch/x86/kernel/cpu/vmware.c | 8 ++--- arch/x86/kernel/kvm.c | 9 +++--- arch/x86/kernel/setup.c | 2 +- arch/x86/kernel/x86_init.c | 10 ++++++ arch/x86/mm/init.c | 2 +- arch/x86/xen/enlighten_hvm.c | 36 ++++++++++++++++----- arch/x86/xen/enlighten_pv.c | 6 ++-- arch/x86/xen/enlighten_pvh.c | 9 ------ drivers/hv/vmbus_drv.c | 2 +- drivers/input/mouse/vmmouse.c | 10 +++--- drivers/misc/vmw_balloon.c | 2 +- include/linux/hypervisor.h | 8 +++-- 21 files changed, 155 insertions(+), 108 deletions(-)
| |