From: Mark Pulford <mark@kyne.com.au>
Date: Fri, 6 Dec 2019 22:50:17 +0000 (+1100)
Subject: runtime: suggest more kernel options for mlock failure
X-Git-Tag: go1.14beta1~35
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9d4717d5f1d9b8a16c52c46d2a670c230dc72cbc;p=gostls13.git

runtime: suggest more kernel options for mlock failure

Some Linux distributions will continue to provide 5.3.x kernels for a
while rather than 5.4.x.

Updates #35777

Change-Id: I493ef8338d94475f4fb1402ffb9040152832b0fd
Reviewed-on: https://go-review.googlesource.com/c/go/+/210299
Reviewed-by: Austin Clements <austin@google.com>
---

diff --git a/src/runtime/os_linux_x86.go b/src/runtime/os_linux_x86.go
index 61c51f2327..0e1c9185b1 100644
--- a/src/runtime/os_linux_x86.go
+++ b/src/runtime/os_linux_x86.go
@@ -68,7 +68,7 @@ func mlockGsignal(gsignal *g) {
 		if err == -_ENOMEM {
 			println("runtime: increase the mlock limit (ulimit -l) or")
 		}
-		println("runtime: update your kernel to 5.4.2 or later")
+		println("runtime: update your kernel to 5.3.15+, 5.4.2+, or 5.5+")
 		throw("mlock failed")
 	}
 }