diff options
| author | Michael Stapelberg <michael@stapelberg.de> | 2013-08-13 13:44:32 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2013-08-13 13:44:32 +0200 |
| commit | 436bdaf6f17a623e324c52ecc17a6da0ebf3ea41 (patch) | |
| tree | bac2f35f921ef1c0168cd617bb64ccac31b6fd2d /src/pkg/syscall/syscall_linux_386.go | |
| parent | 05cc04cd5e3b09971b8de97720870cc6772a1af9 (diff) | |
| parent | b901efe83e212f0c34c769c079e41373da12d723 (diff) | |
| download | golang-436bdaf6f17a623e324c52ecc17a6da0ebf3ea41.tar.gz | |
Merge tag 'upstream/1.1.2' into debian-sid
Upstream version 1.1.2
Diffstat (limited to 'src/pkg/syscall/syscall_linux_386.go')
| -rw-r--r-- | src/pkg/syscall/syscall_linux_386.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go index a0ded43dc..a61695676 100644 --- a/src/pkg/syscall/syscall_linux_386.go +++ b/src/pkg/syscall/syscall_linux_386.go @@ -78,7 +78,7 @@ const rlimInf32 = ^uint32(0) const rlimInf64 = ^uint64(0) func Getrlimit(resource int, rlim *Rlimit) (err error) { - err = prlimit(0, resource, rlim, nil) + err = prlimit(0, resource, nil, rlim) if err != ENOSYS { return err } @@ -106,7 +106,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) { //sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT func Setrlimit(resource int, rlim *Rlimit) (err error) { - err = prlimit(0, resource, nil, rlim) + err = prlimit(0, resource, rlim, nil) if err != ENOSYS { return err } |