diff options
| author | Andrei Vagin <avagin@google.com> | 2019-10-02 13:00:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-02 13:00:07 -0700 |
| commit | 9a875306dbabcf335a2abccc08119a1b67d0e51a (patch) | |
| tree | 0f72c12e951a5eee7156df7a5d63351bc89befa6 /pkg/sentry/kernel/thread_group.go | |
| parent | 38bc0b6b6addd25ceec4f66ef1af41c1e61e2985 (diff) | |
| parent | 03ce4dd86c9acd6b6148f68d5d2cf025d8c254bb (diff) | |
Merge branch 'master' into pr_syscall_linux
Diffstat (limited to 'pkg/sentry/kernel/thread_group.go')
| -rw-r--r-- | pkg/sentry/kernel/thread_group.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/thread_group.go b/pkg/sentry/kernel/thread_group.go index 0eef24bfb..72568d296 100644 --- a/pkg/sentry/kernel/thread_group.go +++ b/pkg/sentry/kernel/thread_group.go @@ -511,8 +511,9 @@ type itimerRealListener struct { } // Notify implements ktime.TimerListener.Notify. -func (l *itimerRealListener) Notify(exp uint64) { +func (l *itimerRealListener) Notify(exp uint64, setting ktime.Setting) (ktime.Setting, bool) { l.tg.SendSignal(SignalInfoPriv(linux.SIGALRM)) + return ktime.Setting{}, false } // Destroy implements ktime.TimerListener.Destroy. |