From 3f335ea2131b14bca2333b4316c8d4dd737e30db Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 12 May 2011 19:34:15 -0700
Subject: [PATCH] Staging: hv: Include the newly created header file in all of
 the relevant hyperv files

Include the newly created header file in all of the relevant hyperv files.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/hv/blkvsc_drv.c   |  2 ++
 drivers/staging/hv/channel.c      |  2 ++
 drivers/staging/hv/channel_mgmt.c |  2 ++
 drivers/staging/hv/connection.c   |  2 ++
 drivers/staging/hv/hv.c           |  2 ++
 drivers/staging/hv/hv_api.h       |  5 -----
 drivers/staging/hv/hv_kvp.c       |  1 +
 drivers/staging/hv/hv_mouse.c     |  1 +
 drivers/staging/hv/hv_util.c      |  1 +
 drivers/staging/hv/hyperv.h       | 10 ++++++++++
 drivers/staging/hv/netvsc.c       |  2 ++
 drivers/staging/hv/netvsc_drv.c   |  2 ++
 drivers/staging/hv/ring_buffer.c  |  2 ++
 drivers/staging/hv/rndis_filter.c |  2 ++
 drivers/staging/hv/storvsc.c      |  2 ++
 drivers/staging/hv/storvsc_drv.c  |  2 ++
 drivers/staging/hv/vmbus_drv.c    |  2 ++
 17 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index f67938cb5a15..0e5206ab5d09 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -31,6 +31,8 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/channel.c b/drivers/staging/hv/channel.c
index a2a190ebcdd8..071556268d94 100644
--- a/drivers/staging/hv/channel.c
+++ b/drivers/staging/hv/channel.c
@@ -26,6 +26,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/channel_mgmt.c b/drivers/staging/hv/channel_mgmt.c
index 33cb5d5a9b84..1184fffce0d1 100644
--- a/drivers/staging/hv/channel_mgmt.c
+++ b/drivers/staging/hv/channel_mgmt.c
@@ -28,6 +28,8 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/completion.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c
index dd625855b08f..0128b50f5a9d 100644
--- a/drivers/staging/hv/connection.c
+++ b/drivers/staging/hv/connection.c
@@ -28,6 +28,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/hv.c b/drivers/staging/hv/hv.c
index 2efac38dfd8c..a28fc31ca850 100644
--- a/drivers/staging/hv/hv.c
+++ b/drivers/staging/hv/hv.c
@@ -25,6 +25,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"
diff --git a/drivers/staging/hv/hv_api.h b/drivers/staging/hv/hv_api.h
index 43a722888dc4..b24493a9980b 100644
--- a/drivers/staging/hv/hv_api.h
+++ b/drivers/staging/hv/hv_api.h
@@ -23,11 +23,6 @@
 #ifndef __HV_API_H
 #define __HV_API_H
 
-struct hv_guid {
-	unsigned char data[16];
-};
-
-
 
 /* Status codes for hypervisor operations. */
 
diff --git a/drivers/staging/hv/hv_kvp.c b/drivers/staging/hv/hv_kvp.c
index c71a1486544d..04875c2f0933 100644
--- a/drivers/staging/hv/hv_kvp.c
+++ b/drivers/staging/hv/hv_kvp.c
@@ -27,6 +27,7 @@
 #include <linux/connector.h>
 #include <linux/workqueue.h>
 
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"
diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index af4db6422635..78db75d127be 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -26,6 +26,7 @@
 #include <linux/dmi.h>
 #include <linux/delay.h>
 
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index ea76ddaa5fcd..672a5961d63b 100644
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -29,6 +29,7 @@
 #include <linux/dmi.h>
 #include <linux/pci.h>
 
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"
diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h
index 24e42b39efc6..32193119de0c 100644
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -21,3 +21,13 @@
  *   K. Y. Srinivasan <kys@microsoft.com>
  *
  */
+
+#ifndef _HYPERV_H
+#define _HYPERV_H
+
+struct hv_guid {
+	unsigned char data[16];
+};
+
+
+#endif /* _HYPERV_H */
diff --git a/drivers/staging/hv/netvsc.c b/drivers/staging/hv/netvsc.c
index 4eb448226ef1..368ac68b7c61 100644
--- a/drivers/staging/hv/netvsc.c
+++ b/drivers/staging/hv/netvsc.c
@@ -27,6 +27,8 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "netvsc.h"
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index c5e7b93692e0..93c9ee1c6059 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -38,6 +38,8 @@
 #include <net/route.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/ring_buffer.c b/drivers/staging/hv/ring_buffer.c
index badf52ad2416..809bce28aea7 100644
--- a/drivers/staging/hv/ring_buffer.c
+++ b/drivers/staging/hv/ring_buffer.c
@@ -25,6 +25,8 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+
+#include "hyperv.h"
 #include "logging.h"
 #include "ring_buffer.h"
 
diff --git a/drivers/staging/hv/rndis_filter.c b/drivers/staging/hv/rndis_filter.c
index 20378365b108..5eff454bf585 100644
--- a/drivers/staging/hv/rndis_filter.c
+++ b/drivers/staging/hv/rndis_filter.c
@@ -26,6 +26,8 @@
 #include <linux/io.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
+
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "netvsc_api.h"
diff --git a/drivers/staging/hv/storvsc.c b/drivers/staging/hv/storvsc.c
index 8d7a49038178..4ffcf5f3bcf2 100644
--- a/drivers/staging/hv/storvsc.c
+++ b/drivers/staging/hv/storvsc.c
@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "storvsc_api.h"
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 907d85568cc1..c0633e9eceac 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -32,6 +32,8 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_dbg.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 5dcd87a972a4..2b2ada7f3386 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -34,6 +34,8 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <linux/completion.h>
+
+#include "hyperv.h"
 #include "version_info.h"
 #include "hv_api.h"
 #include "logging.h"
-- 
GitLab