diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2017-01-18 16:45:00 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-19 11:42:07 +0100 |
| commit | 3f646ed70ccd1c4e5c1263d2922247d28c8e08f0 (patch) | |
| tree | 92f192d29814fa18036a8afd5ecfa48ee398284c | |
| parent | a0227cf344e2a33bd4454cf09e56a2a9a8fbfc1d (diff) | |
| download | linux-3f646ed70ccd1c4e5c1263d2922247d28c8e08f0.tar.gz linux-3f646ed70ccd1c4e5c1263d2922247d28c8e08f0.tar.bz2 linux-3f646ed70ccd1c4e5c1263d2922247d28c8e08f0.zip | |
Drivers: hv: vmbus: Move the definition of hv_x64_msr_hypercall_contents
As part of the effort to separate out architecture specific code, move the
definition of hv_x64_msr_hypercall_contents to x86 specific header file.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/x86/include/asm/mshyperv.h | 12 | ||||
| -rw-r--r-- | drivers/hv/hyperv_vmbus.h | 15 |
2 files changed, 12 insertions, 15 deletions
diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index aaf59b7da98a..188ddfdde2b9 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -13,6 +13,18 @@ struct ms_hyperv_info { extern struct ms_hyperv_info ms_hyperv; +/* + * Declare the MSR used to setup pages used to communicate with the hypervisor. + */ +union hv_x64_msr_hypercall_contents { + u64 as_uint64; + struct { + u64 enable:1; + u64 reserved:11; + u64 guest_physical_address:52; + }; +}; + void hyperv_callback_vector(void); #ifdef CONFIG_TRACING #define trace_hyperv_callback_vector hyperv_callback_vector diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 83beea748c6f..a1ff03677e23 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -306,21 +306,6 @@ union hv_x64_msr_guest_os_id_contents { }; }; -/* - * Declare the MSR used to setup pages used to communicate with the hypervisor. - */ -#define HV_X64_MSR_HYPERCALL 0x40000001 - -union hv_x64_msr_hypercall_contents { - u64 as_uint64; - struct { - u64 enable:1; - u64 reserved:11; - u64 guest_physical_address:52; - }; -}; - - enum { VMBUS_MESSAGE_CONNECTION_ID = 1, VMBUS_MESSAGE_PORT_ID = 1, |