diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-02-04 21:41:56 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-02-04 21:41:56 +0000 |
| commit | 6dd6869490b13613ff0eb278ea9c7745d4792580 (patch) | |
| tree | 41e133c7ac80fa86af2fa45f78baffd5a5fbd32f /pkg/sentry/syscalls/linux | |
| parent | 4f6e213fce034a9a155a23c92654b136c30c4b2c (diff) | |
| parent | 6823b5e244a5748032130574ae3a25a0a36bbbf5 (diff) | |
Merge release-20200127.0-63-g6823b5e (automated)
Diffstat (limited to 'pkg/sentry/syscalls/linux')
| -rw-r--r-- | pkg/sentry/syscalls/linux/sys_timer.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/syscalls/linux/sys_timer.go b/pkg/sentry/syscalls/linux/sys_timer.go index 432351917..a4c400f87 100644 --- a/pkg/sentry/syscalls/linux/sys_timer.go +++ b/pkg/sentry/syscalls/linux/sys_timer.go @@ -146,7 +146,7 @@ func TimerCreate(t *kernel.Task, args arch.SyscallArguments) (uintptr, *kernel.S return 0, nil, err } - return uintptr(id), nil, nil + return 0, nil, nil } // TimerSettime implements linux syscall timer_settime(2). |