← Back to branch summary

~ubuntu-branches/ubuntu/saucy/golang/saucy

« back to all changes in this revision

Viewing changes to src/pkg/syscall/syscall_linux_386.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-08-20 14:06:23 UTC
  • mfrom: (29.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20130820140623-k58q6hviulolwb09
Tags: 2:1.1.2-2ubuntu1
https://launchpad.net/bugs/1211749
https://launchpad.net/bugs/1202027
* Merge from Debian unstable (LP: #1211749, #1202027). Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - d/control,control.cross: Update Breaks/Replaces for Ubuntu
    versions to ensure smooth upgrades, regenerate control file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/pkg/syscall/syscall_linux_386.go
78
78
const rlimInf64 = ^uint64(0)
79
79
 
80
80
func Getrlimit(resource int, rlim *Rlimit) (err error) {
81
 
        err = prlimit(0, resource, rlim, nil)
 
81
        err = prlimit(0, resource, nil, rlim)
82
82
        if err != ENOSYS {
83
83
                return err
84
84
        }
106
106
//sysnb setrlimit(resource int, rlim *rlimit32) (err error) = SYS_SETRLIMIT
107
107
 
108
108
func Setrlimit(resource int, rlim *Rlimit) (err error) {
109
 
        err = prlimit(0, resource, nil, rlim)
 
109
        err = prlimit(0, resource, rlim, nil)
110
110
        if err != ENOSYS {
111
111
                return err
112
112
        }