mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-11-01 03:44:29 +00:00
130e546fcf
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>
50 lines
2.0 KiB
Diff
50 lines
2.0 KiB
Diff
From c10ff3a93c84f1d801df6c9f4296e07a9824cadd Mon Sep 17 00:00:00 2001
|
|
From: Dexuan Cui <decui@microsoft.com>
|
|
Date: Mon, 21 Mar 2016 02:53:08 -0700
|
|
Subject: [PATCH 40/44] net: add the AF_HYPERV entries to family name tables
|
|
|
|
This is for the hv_sock driver, which introduces AF_HYPERV(42).
|
|
|
|
Signed-off-by: Dexuan Cui <decui@microsoft.com>
|
|
Cc: "K. Y. Srinivasan" <kys@microsoft.com>
|
|
Cc: Haiyang Zhang <haiyangz@microsoft.com>
|
|
Origin: https://patchwork.ozlabs.org/patch/600009
|
|
---
|
|
net/core/sock.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/net/core/sock.c b/net/core/sock.c
|
|
index ba24aeb6999c..c75ebeec3290 100644
|
|
--- a/net/core/sock.c
|
|
+++ b/net/core/sock.c
|
|
@@ -264,7 +264,7 @@ static const char *const af_family_key_strings[AF_MAX+1] = {
|
|
"sk_lock-AF_RXRPC" , "sk_lock-AF_ISDN" , "sk_lock-AF_PHONET" ,
|
|
"sk_lock-AF_IEEE802154", "sk_lock-AF_CAIF" , "sk_lock-AF_ALG" ,
|
|
"sk_lock-AF_NFC" , "sk_lock-AF_VSOCK" , "sk_lock-AF_KCM" ,
|
|
- "sk_lock-AF_MAX"
|
|
+ "sk_lock-AF_HYPERV", "sk_lock-AF_MAX"
|
|
};
|
|
static const char *const af_family_slock_key_strings[AF_MAX+1] = {
|
|
"slock-AF_UNSPEC", "slock-AF_UNIX" , "slock-AF_INET" ,
|
|
@@ -281,7 +281,7 @@ static const char *const af_family_slock_key_strings[AF_MAX+1] = {
|
|
"slock-AF_RXRPC" , "slock-AF_ISDN" , "slock-AF_PHONET" ,
|
|
"slock-AF_IEEE802154", "slock-AF_CAIF" , "slock-AF_ALG" ,
|
|
"slock-AF_NFC" , "slock-AF_VSOCK" ,"slock-AF_KCM" ,
|
|
- "slock-AF_MAX"
|
|
+ "slock-AF_HYPERV", "slock-AF_MAX"
|
|
};
|
|
static const char *const af_family_clock_key_strings[AF_MAX+1] = {
|
|
"clock-AF_UNSPEC", "clock-AF_UNIX" , "clock-AF_INET" ,
|
|
@@ -298,7 +298,7 @@ static const char *const af_family_clock_key_strings[AF_MAX+1] = {
|
|
"clock-AF_RXRPC" , "clock-AF_ISDN" , "clock-AF_PHONET" ,
|
|
"clock-AF_IEEE802154", "clock-AF_CAIF" , "clock-AF_ALG" ,
|
|
"clock-AF_NFC" , "clock-AF_VSOCK" , "clock-AF_KCM" ,
|
|
- "clock-AF_MAX"
|
|
+ "clock-AF_HYPERV", "clock-AF_MAX"
|
|
};
|
|
|
|
/*
|
|
--
|
|
2.11.0
|
|
|