Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754526AbcL3Tlz (ORCPT ); Fri, 30 Dec 2016 14:41:55 -0500 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:33090 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754125AbcL3Tjd (ORCPT ); Fri, 30 Dec 2016 14:39:33 -0500 x-originating-ip: 72.167.245.219 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com, rkagan@virtuozzo.com, x86@kernel.org, tglx@linutronix.de, hpa@zytor.com Cc: "K. Y. Srinivasan" Subject: [PATCH 01/18] Drivers: hv: vmbus: Move the definition of hv_x64_msr_hypercall_contents Date: Fri, 30 Dec 2016 13:35:55 -0800 Message-Id: <1483133772-29776-1-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1483133701-29738-1-git-send-email-kys@exchange.microsoft.com> References: <1483133701-29738-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfOoSKSMkiNKHwKJKtZna5EHQNMceJ1pwYHf6OtHkJTRo52FOzl/mxeQAvgsJa5CDzNodwjMqXHiZWTdCs+sShuSadM4yXgoEGRSstsHBXWR4c8E4Smu7 RZ91KHd21zBGBWPChn1PBHgzxIt3d+ovMT7t3X/sd39zQbgMH0LxKpVfg+/xk/7JDgd3lOnYi1PmjqDuS+mj2NwHCAg0FUVTkqbudpIEjjIUHJoprM7J7ny8 DHleVF1sLczBwXkvwNexi5mvkDfVFQRv4cuFPmQUD0lsbbDxNwKOdBcyPHNza2eHXDkpjD/RZY8fjIeEIPy8rgV58khICL4PDZzKcSE0oUkvC2Lp5cb5m6Sw PaVcApZf7v8A5vuEnlKWSl0KbOFixANiY/1m5yVkzQ398VWkyrXq7rnV5imXRTcqOwin3QQ1Q5qAoPzCj6uQm5LfYcVNLZ0Ruc6aYeYZK/6oY41rt2IgoIZh aSZINyD2iZYpghvPoGhKbAHi+/H+5OEcNt0fH4LZNBwRiWrfmPB0zThqZxgWLiO8VYX84Vnly80VxPEhTFIHjdCWU0OZUNfpb+4YXA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1638 Lines: 62 From: K. Y. Srinivasan 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 --- arch/x86/include/asm/mshyperv.h | 12 ++++++++++++ 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 aaf59b7..188ddfd 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 83beea7..a1ff036 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -306,21 +306,6 @@ enum hv_guest_os_microsoft_ids { }; }; -/* - * 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, -- 1.7.4.1