[PATCH 02/64] Staging: hv: Include the newly created header file in all of the relevant hyperv files
K. Y. Srinivasan
kys at microsoft.com
Fri May 13 02:34:15 UTC 2011
Include the newly created header file in all of the relevant hyperv files.
Signed-off-by: K. Y. Srinivasan <kys at microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz at microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane at microsoft.com>
Signed-off-by: Hank Janssen <hjanssen at microsoft.com>
---
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 f67938c..0e5206a 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 a2a190e..07155626 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 33cb5d5..1184fff 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 dd62585..0128b50 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 2efac38..a28fc31 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 43a7228..b24493a 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 c71a148..04875c2 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 af4db64..78db75d 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 ea76dda..672a596 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 24e42b3..3219311 100644
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -21,3 +21,13 @@
* K. Y. Srinivasan <kys at 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 4eb4482..368ac68 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 c5e7b93..93c9ee1 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 badf52a..809bce2 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 2037836..5eff454 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 8d7a490..4ffcf5f 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 907d855..c0633e9 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 5dcd87a..2b2ada7 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"
--
1.7.4.1
More information about the devel
mailing list