diff options
| author | Ayush Ranjan <ayushranjan@google.com> | 2021-06-10 10:23:53 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-06-10 10:26:36 -0700 |
| commit | 9ede1a6058131b50340427c8d0fd3a9ccef5e300 (patch) | |
| tree | ebd9b33ad86b7e20726699a6db981ff43995a934 /pkg/sentry/kernel/posixtimer.go | |
| parent | d3ebc2db68974daa5d3528568c0144743ac88593 (diff) | |
[op] Move SignalInfo to abi/linux package.
Fixes #214
PiperOrigin-RevId: 378680466
Diffstat (limited to 'pkg/sentry/kernel/posixtimer.go')
| -rw-r--r-- | pkg/sentry/kernel/posixtimer.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkg/sentry/kernel/posixtimer.go b/pkg/sentry/kernel/posixtimer.go index 2e861a5a8..d801a3d83 100644 --- a/pkg/sentry/kernel/posixtimer.go +++ b/pkg/sentry/kernel/posixtimer.go @@ -18,7 +18,6 @@ import ( "math" "gvisor.dev/gvisor/pkg/abi/linux" - "gvisor.dev/gvisor/pkg/sentry/arch" ktime "gvisor.dev/gvisor/pkg/sentry/kernel/time" "gvisor.dev/gvisor/pkg/syserror" ) @@ -97,7 +96,7 @@ func (it *IntervalTimer) ResumeTimer() { } // Preconditions: it.target's signal mutex must be locked. -func (it *IntervalTimer) updateDequeuedSignalLocked(si *arch.SignalInfo) { +func (it *IntervalTimer) updateDequeuedSignalLocked(si *linux.SignalInfo) { it.sigpending = false if it.sigorphan { return @@ -138,9 +137,9 @@ func (it *IntervalTimer) Notify(exp uint64, setting ktime.Setting) (ktime.Settin it.sigpending = true it.sigorphan = false it.overrunCur += exp - 1 - si := &arch.SignalInfo{ + si := &linux.SignalInfo{ Signo: int32(it.signo), - Code: arch.SignalInfoTimer, + Code: linux.SI_TIMER, } si.SetTimerID(it.id) si.SetSigval(it.sigval) |