aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpvoicu <pvoicu@paypal.com>2017-08-18 03:32:49 -0700
committerRuss Cox <rsc@golang.org>2017-10-20 12:36:12 -0400
commit20176bce822d672f1b6ae6191be90a908d1e349a (patch)
treed19c26973e6df94ad503bfaeafc3e0e2ea742463
parentdd9b69d83884731e33f007b7414f523000e3154c (diff)
downloadgo-20176bce822d672f1b6ae6191be90a908d1e349a.tar.gz
go-20176bce822d672f1b6ae6191be90a908d1e349a.zip
[release-branch.go1.8] runtime: fix usleep by correctly setting nanoseconds parameter for pselect6
Fixes #21518 Change-Id: Idd67e3f0410d0ce991b34dcc0c8f15e0d5c529c9 Reviewed-on: https://go-review.googlesource.com/56850 Reviewed-by: Ian Lance Taylor <iant@golang.org> Reviewed-by: Austin Clements <austin@google.com> Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
-rw-r--r--src/runtime/sys_linux_386.s2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/sys_linux_386.s b/src/runtime/sys_linux_386.s
index ba6f7cc8dd..04675d1689 100644
--- a/src/runtime/sys_linux_386.s
+++ b/src/runtime/sys_linux_386.s
@@ -100,7 +100,7 @@ TEXT runtimeĀ·usleep(SB),NOSPLIT,$8
MOVL AX, 0(SP)
MOVL $1000, AX // usec to nsec
MULL DX
- MOVL DX, 4(SP)
+ MOVL AX, 4(SP)
// pselect6(0, 0, 0, 0, &ts, 0)
MOVL $308, AX