The Hyper-V MSI entry is architecture specific. Currently, it is
defined in an arch neutral location. This patch moves it to an
arch specific location.

Signed-off-by: Sunil Muthuswamy <sunil...@microsoft.com>
---
 arch/x86/include/asm/hyperv-tlfs.h | 7 +++++++
 include/asm-generic/hyperv-tlfs.h  | 8 --------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/arch/x86/include/asm/hyperv-tlfs.h 
b/arch/x86/include/asm/hyperv-tlfs.h
index 6bf42aed387e..a15c17c7f019 100644
--- a/arch/x86/include/asm/hyperv-tlfs.h
+++ b/arch/x86/include/asm/hyperv-tlfs.h
@@ -523,6 +523,13 @@ struct hv_partition_assist_pg {
        u32 tlb_lock_count;
 };
 
+union hv_msi_entry {
+       u64 as_uint64;
+       struct {
+               u32 address;
+               u32 data;
+       } __packed;
+};
 
 #include <asm-generic/hyperv-tlfs.h>
 
diff --git a/include/asm-generic/hyperv-tlfs.h 
b/include/asm-generic/hyperv-tlfs.h
index e73a11850055..6265f4494970 100644
--- a/include/asm-generic/hyperv-tlfs.h
+++ b/include/asm-generic/hyperv-tlfs.h
@@ -408,14 +408,6 @@ struct hv_tlb_flush_ex {
 } __packed;
 
 /* HvRetargetDeviceInterrupt hypercall */
-union hv_msi_entry {
-       u64 as_uint64;
-       struct {
-               u32 address;
-               u32 data;
-       } __packed;
-};
-
 struct hv_interrupt_entry {
        u32 source;                     /* 1 for MSI(-X) */
        u32 reserved1;
-- 
2.17.1

Reply via email to