---

yaml --- r: 354987 b: refs/heads/master c: eafa707 h: refs/heads/master i: 354985: bb3bb8d 354983: bf98116 v: v3
git-mirror · Jan 17, 2013 · 4d98c78 · 4d98c78
1 parent 866ef38
commit 4d98c78
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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)