Browse Source

Drivers: hv: util: move kvp/vss function declarations to hyperv_vmbus.h

These declarations are internal to hv_util module and hv_fcopy_* declarations
already reside there.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Tested-by: Alex Ng <alexng@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Vitaly Kuznetsov 10 years ago
parent
commit
3647a83d9d
4 changed files with 11 additions and 7 deletions
  1. 1 0
      drivers/hv/hv_kvp.c
  2. 2 0
      drivers/hv/hv_snapshot.c
  3. 8 0
      drivers/hv/hyperv_vmbus.h
  4. 0 7
      include/linux/hyperv.h

+ 1 - 0
drivers/hv/hv_kvp.c

@@ -28,6 +28,7 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/hyperv.h>
 #include <linux/hyperv.h>
 
 
+#include "hyperv_vmbus.h"
 
 
 /*
 /*
  * Pre win8 version numbers used in ws2008 and ws 2008 r2 (win7)
  * Pre win8 version numbers used in ws2008 and ws 2008 r2 (win7)

+ 2 - 0
drivers/hv/hv_snapshot.c

@@ -24,6 +24,8 @@
 #include <linux/workqueue.h>
 #include <linux/workqueue.h>
 #include <linux/hyperv.h>
 #include <linux/hyperv.h>
 
 
+#include "hyperv_vmbus.h"
+
 #define VSS_MAJOR  5
 #define VSS_MAJOR  5
 #define VSS_MINOR  0
 #define VSS_MINOR  0
 #define VSS_VERSION    (VSS_MAJOR << 16 | VSS_MINOR)
 #define VSS_VERSION    (VSS_MAJOR << 16 | VSS_MINOR)

+ 8 - 0
drivers/hv/hyperv_vmbus.h

@@ -730,6 +730,14 @@ int vmbus_set_event(struct vmbus_channel *channel);
 
 
 void vmbus_on_event(unsigned long data);
 void vmbus_on_event(unsigned long data);
 
 
+int hv_kvp_init(struct hv_util_service *);
+void hv_kvp_deinit(void);
+void hv_kvp_onchannelcallback(void *);
+
+int hv_vss_init(struct hv_util_service *);
+void hv_vss_deinit(void);
+void hv_vss_onchannelcallback(void *);
+
 int hv_fcopy_init(struct hv_util_service *);
 int hv_fcopy_init(struct hv_util_service *);
 void hv_fcopy_deinit(void);
 void hv_fcopy_deinit(void);
 void hv_fcopy_onchannelcallback(void *);
 void hv_fcopy_onchannelcallback(void *);

+ 0 - 7
include/linux/hyperv.h

@@ -1236,13 +1236,6 @@ extern bool vmbus_prep_negotiate_resp(struct icmsg_hdr *,
 					struct icmsg_negotiate *, u8 *, int,
 					struct icmsg_negotiate *, u8 *, int,
 					int);
 					int);
 
 
-int hv_kvp_init(struct hv_util_service *);
-void hv_kvp_deinit(void);
-void hv_kvp_onchannelcallback(void *);
-
-int hv_vss_init(struct hv_util_service *);
-void hv_vss_deinit(void);
-void hv_vss_onchannelcallback(void *);
 void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid);
 void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid);
 
 
 extern struct resource hyperv_mmio;
 extern struct resource hyperv_mmio;