From 4d98c78466b4da2f5e4b7cd3076cc1f44571a079 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Sat, 1 Dec 2012 06:46:44 -0800
Subject: [PATCH] --- yaml --- r: 354987 b: refs/heads/master c:
 eafa7072e7cd806dff42b705284ca26189e527a4 h: refs/heads/master i:   354985:
 bb3bb8d80b5abc2785d07ac4fa29c9eba1b23880   354983:
 bf98116766ee2780b1f19f2c387cc9dc41571e9f v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/hv/connection.c | 15 ---------------
 trunk/include/linux/hyperv.h  | 15 +++++++++++++++
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 197f00e87411..cd197e5e3a52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21c3bef5db359596806f19fee6c3ec0c033881d0
+refs/heads/master: eafa7072e7cd806dff42b705284ca26189e527a4
diff --git a/trunk/drivers/hv/connection.c b/trunk/drivers/hv/connection.c
index 0d8b13290e93..56b14e57bdd8 100644
--- a/trunk/drivers/hv/connection.c
+++ b/trunk/drivers/hv/connection.c
@@ -40,21 +40,6 @@ struct vmbus_connection vmbus_connection = {
 	.next_gpadl_handle	= ATOMIC_INIT(0xE1E10),
 };
 
-/*
- * VMBUS version is 32 bit entity broken up into
- * two 16 bit quantities: major_number. minor_number.
- *
- * 0 . 13 (Windows Server 2008)
- * 1 . 1  (Windows 7)
- * 2 . 4  (Windows 8)
- */
-
-#define VERSION_WS2008	((0 << 16) | (13))
-#define VERSION_WIN7	((1 << 16) | (1))
-#define VERSION_WIN8	((2 << 16) | (4))
-
-#define VERSION_INVAL -1
-
 /*
  * Negotiated protocol version with the host.
  */
diff --git a/trunk/include/linux/hyperv.h b/trunk/include/linux/hyperv.h
index 134a2022a7a3..e72502689cdc 100644
--- a/trunk/include/linux/hyperv.h
+++ b/trunk/include/linux/hyperv.h
@@ -419,6 +419,21 @@ hv_get_ringbuffer_availbytes(struct hv_ring_buffer_info *rbi,
  */
 #define HV_DRV_VERSION           "3.1"
 
+/*
+ * VMBUS version is 32 bit entity broken up into
+ * two 16 bit quantities: major_number. minor_number.
+ *
+ * 0 . 13 (Windows Server 2008)
+ * 1 . 1  (Windows 7)
+ * 2 . 4  (Windows 8)
+ */
+
+#define VERSION_WS2008  ((0 << 16) | (13))
+#define VERSION_WIN7    ((1 << 16) | (1))
+#define VERSION_WIN8    ((2 << 16) | (4))
+
+#define VERSION_INVAL -1
+
 
 /* Make maximum size of pipe payload of 16K */
 #define MAX_PIPE_DATA_PAYLOAD		(sizeof(u8) * 16384)