mirror of
				https://github.com/linuxkit/linuxkit.git
				synced 2025-11-04 07:15:14 +00:00 
			
		
		
		
	In 4.10.5 and 4.9.17 include a fix for the VMBus memory leak, cherry-picked from char-misc: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/commit/?h=char-misc-linus&id=5e030d5ce9d99a899b648413139ff65bab12b038 This patch was tested with the 4.10.5 kernel and the Hyper-V Socket stress test. It was forwarded to stable@vger to be included in one of the next stable releases. Also remove the CPU ACCT revert as 17.03.1-rc1 is out and has a fix Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
		
			
				
	
	
		
			48 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From f9946a9224a088c80e6340696b0f9cdc4da5847c Mon Sep 17 00:00:00 2001
 | 
						|
From: Alex Ng <alexng@messages.microsoft.com>
 | 
						|
Date: Sun, 6 Nov 2016 13:14:07 -0800
 | 
						|
Subject: [PATCH 3/8] Drivers: hv: utils: Fix the mapping between host version
 | 
						|
 and protocol to use
 | 
						|
 | 
						|
We should intentionally declare the protocols to use for every known host
 | 
						|
and default to using the latest protocol if the host is unknown or new.
 | 
						|
 | 
						|
Signed-off-by: Alex Ng <alexng@microsoft.com>
 | 
						|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
 | 
						|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 | 
						|
(cherry picked from commit 3da0401b4d0e17aea7526db0235d98fa535d903e)
 | 
						|
---
 | 
						|
 drivers/hv/hv_util.c | 9 ++++++---
 | 
						|
 1 file changed, 6 insertions(+), 3 deletions(-)
 | 
						|
 | 
						|
diff --git a/drivers/hv/hv_util.c b/drivers/hv/hv_util.c
 | 
						|
index bcd06306f3e8..e7707747f56d 100644
 | 
						|
--- a/drivers/hv/hv_util.c
 | 
						|
+++ b/drivers/hv/hv_util.c
 | 
						|
@@ -389,16 +389,19 @@ static int util_probe(struct hv_device *dev,
 | 
						|
 		ts_srv_version = TS_VERSION_1;
 | 
						|
 		hb_srv_version = HB_VERSION_1;
 | 
						|
 		break;
 | 
						|
-	case(VERSION_WIN10):
 | 
						|
+	case VERSION_WIN7:
 | 
						|
+	case VERSION_WIN8:
 | 
						|
+	case VERSION_WIN8_1:
 | 
						|
 		util_fw_version = UTIL_FW_VERSION;
 | 
						|
 		sd_srv_version = SD_VERSION;
 | 
						|
-		ts_srv_version = TS_VERSION;
 | 
						|
+		ts_srv_version = TS_VERSION_3;
 | 
						|
 		hb_srv_version = HB_VERSION;
 | 
						|
 		break;
 | 
						|
+	case VERSION_WIN10:
 | 
						|
 	default:
 | 
						|
 		util_fw_version = UTIL_FW_VERSION;
 | 
						|
 		sd_srv_version = SD_VERSION;
 | 
						|
-		ts_srv_version = TS_VERSION_3;
 | 
						|
+		ts_srv_version = TS_VERSION;
 | 
						|
 		hb_srv_version = HB_VERSION;
 | 
						|
 	}
 | 
						|
 
 | 
						|
-- 
 | 
						|
2.11.0
 | 
						|
 |