qiurui
/
rv1126-kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hv: rename prep_negotiate_resp() to vmbus_prep_negotiate_resp() 

It's a global symbol, so properly prefix it and use the proper EXPORT
value as well.

Cc: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2011-10-11 08:42:28 -06:00
parent 407dd16443
commit da0e96315c
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hv/channel_mgmt.c
View File

@ -114,7 +114,7 @@ static const uuid_le
/** /**
* prep_negotiate_resp() - Create default response for Hyper-V Negotiate message * vmbus_prep_negotiate_resp() - Create default response for Hyper-V Negotiate message
* @icmsghdrp: Pointer to msg header structure * @icmsghdrp: Pointer to msg header structure
* @icmsg_negotiate: Pointer to negotiate message structure * @icmsg_negotiate: Pointer to negotiate message structure
* @buf: Raw buffer channel data * @buf: Raw buffer channel data
@ -128,9 +128,8 @@ static const uuid_le
* *
* Mainly used by Hyper-V drivers. * Mainly used by Hyper-V drivers.
*/ */
void prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, void vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp,
struct icmsg_negotiate *negop, struct icmsg_negotiate *negop, u8 *buf)
u8 *buf)
{ {
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
icmsghdrp->icmsgsize = 0x10; icmsghdrp->icmsgsize = 0x10;
@ -156,7 +155,7 @@ void prep_negotiate_resp(struct icmsg_hdr *icmsghdrp,
negop->icmsg_vercnt = 1; negop->icmsg_vercnt = 1;
} }
} }
EXPORT_SYMBOL(prep_negotiate_resp); EXPORT_SYMBOL_GPL(vmbus_prep_negotiate_resp);
/* /*
* alloc_channel - Allocate and initialize a vmbus channel object * alloc_channel - Allocate and initialize a vmbus channel object

2
drivers/hv/hv_kvp.c
View File

@ -260,7 +260,7 @@ void hv_kvp_onchannelcallback(void *context)
sizeof(struct vmbuspipe_hdr)]; sizeof(struct vmbuspipe_hdr)];
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
prep_negotiate_resp(icmsghdrp, negop, recv_buffer); vmbus_prep_negotiate_resp(icmsghdrp, negop, recv_buffer);
} else { } else {
kvp_msg = (struct hv_kvp_msg *)&recv_buffer[ kvp_msg = (struct hv_kvp_msg *)&recv_buffer[
sizeof(struct vmbuspipe_hdr) + sizeof(struct vmbuspipe_hdr) +

6
drivers/hv/hv_util.c
View File

@ -73,7 +73,7 @@ static void shutdown_onchannelcallback(void *context)
sizeof(struct vmbuspipe_hdr)]; sizeof(struct vmbuspipe_hdr)];
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf); vmbus_prep_negotiate_resp(icmsghdrp, negop, shut_txf_buf);
} else { } else {
shutdown_msg = shutdown_msg =
(struct shutdown_msg_data *)&shut_txf_buf[ (struct shutdown_msg_data *)&shut_txf_buf[
@ -198,7 +198,7 @@ static void timesync_onchannelcallback(void *context)
sizeof(struct vmbuspipe_hdr)]; sizeof(struct vmbuspipe_hdr)];
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf); vmbus_prep_negotiate_resp(icmsghdrp, NULL, time_txf_buf);
} else { } else {
timedatap = (struct ictimesync_data *)&time_txf_buf[ timedatap = (struct ictimesync_data *)&time_txf_buf[
sizeof(struct vmbuspipe_hdr) + sizeof(struct vmbuspipe_hdr) +
@ -237,7 +237,7 @@ static void heartbeat_onchannelcallback(void *context)
sizeof(struct vmbuspipe_hdr)]; sizeof(struct vmbuspipe_hdr)];
if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) {
prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf); vmbus_prep_negotiate_resp(icmsghdrp, NULL, hbeat_txf_buf);
} else { } else {
heartbeat_msg = heartbeat_msg =
(struct heartbeat_msg_data *)&hbeat_txf_buf[ (struct heartbeat_msg_data *)&hbeat_txf_buf[

4
include/linux/hyperv.h
View File

@ -960,7 +960,7 @@ struct hyperv_service_callback {
void (*callback) (void *context); void (*callback) (void *context);
}; };
extern void prep_negotiate_resp(struct icmsg_hdr *, extern void vmbus_prep_negotiate_resp(struct icmsg_hdr *,
struct icmsg_negotiate *, u8 *); struct icmsg_negotiate *, u8 *);
#endif /* _HYPERV_H */ #endif /* _HYPERV_H */