Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a485803 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Radim Krčmář
Browse files

x86/hyper-v: move hyperv.h out of uapi 

hyperv.h is not part of uapi, there are no (known) users outside of kernel.
We are making changes to this file to match current Hyper-V Hypervisor
Top-Level Functional Specification (TLFS, see:
https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs

)
and we don't want to maintain backwards compatibility.

Move the file renaming to hyperv-tlfs.h to avoid confusing it with
mshyperv.h. In future, all definitions from TLFS should go to it and
all kernel objects should go to mshyperv.h or include/linux/hyperv.h.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarRadim Krčmář <rkrcmar@redhat.com>
parent 21e94aca

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6531,7 +6531,7 @@ S: Maintained 
F:	Documentation/networking/netvsc.txt

F:	arch/x86/include/asm/mshyperv.h

F:	arch/x86/include/asm/trace/hyperv.h

F:	arch/x86/include/uapi/asm/hyperv.h

F:	arch/x86/include/asm/hyperv-tlfs.h

F:	arch/x86/kernel/cpu/mshyperv.c

F:	arch/x86/hyperv

F:	drivers/hid/hid-hyperv.c

arch/x86/hyperv/hv_init.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <asm/apic.h>

#include <asm/desc.h>

#include <asm/hypervisor.h>

#include <asm/hyperv.h>

#include <asm/hyperv-tlfs.h>

#include <asm/mshyperv.h>

#include <linux/version.h>

#include <linux/vmalloc.h>

arch/x86/include/uapi/asm/hyperv.h→arch/x86/include/asm/hyperv-tlfs.h

+9 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_X86_HYPERV_H

#define _ASM_X86_HYPERV_H



/*

 * This file contains definitions from Hyper-V Hypervisor Top-Level Functional

 * Specification (TLFS):

 * https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/reference/tlfs

 */



#ifndef _ASM_X86_HYPERV_TLFS_H

#define _ASM_X86_HYPERV_TLFS_H



#include <linux/types.h>

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <asm/msr-index.h>

#include <asm/asm.h>

#include <asm/kvm_page_track.h>

#include <asm/hyperv-tlfs.h>



#define KVM_MAX_VCPUS 288

#define KVM_SOFT_MAX_VCPUS 240

arch/x86/include/asm/mshyperv.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#include <linux/atomic.h>

#include <linux/nmi.h>

#include <asm/io.h>

#include <asm/hyperv.h>

#include <asm/hyperv-tlfs.h>

#include <asm/nospec-branch.h>



/*