aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpvoicu <pvoicu@paypal.com>2017-08-18 03:32:49 -0700
committerAustin Clements <austin@google.com>2017-08-18 14:14:39 +0000
commit65717b2dca2d927a2210696c1fe22c0952f9c139 (patch)
tree49869f5a40317dc03af0e0e305b2a243e1e5b7f4
parent048c9cfaacb6fe7ac342b0acd8ca8322b6c49508 (diff)
downloadgo-65717b2dca2d927a2210696c1fe22c0952f9c139.tar.gz
go-65717b2dca2d927a2210696c1fe22c0952f9c139.zip
[release-branch.go1.9] runtime: fix usleep by correctly setting nanoseconds parameter for pselect6
Fixes #21518 Change-Id: Idd67e3f0410d0ce991b34dcc0c8f15e0d5c529c9 Reviewed-on: https://go-review.googlesource.com/56891 Run-TryBot: Austin Clements <austin@google.com> Reviewed-by: Petrica Voicu <pvoicu@paypal.com> Reviewed-by: 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 60618337dc..a3baebae4a 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