diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-10 06:14:54 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-10 06:14:54 +0000 |
| commit | d09b1da02d67a8a51f1b41e0a8e9026218ffa20a (patch) | |
| tree | b32df508ac0b9087e3319a1d2b33dfbb86db8ad1 /pkg/sentry/kernel/memevent | |
| parent | aca2ac5c956a7542eebf50806b0e0171c8caa816 (diff) | |
| parent | 27500d529f7fb87eef8812278fd1bbca67bcba72 (diff) | |
Merge release-20191213.0-96-g27500d5 (automated)
Diffstat (limited to 'pkg/sentry/kernel/memevent')
| -rwxr-xr-x | pkg/sentry/kernel/memevent/memory_events.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/kernel/memevent/memory_events.go b/pkg/sentry/kernel/memevent/memory_events.go index b0d98e7f0..200565bb8 100755 --- a/pkg/sentry/kernel/memevent/memory_events.go +++ b/pkg/sentry/kernel/memevent/memory_events.go @@ -17,7 +17,6 @@ package memevent import ( - "sync" "time" "gvisor.dev/gvisor/pkg/eventchannel" @@ -26,6 +25,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/kernel" pb "gvisor.dev/gvisor/pkg/sentry/kernel/memevent/memory_events_go_proto" "gvisor.dev/gvisor/pkg/sentry/usage" + "gvisor.dev/gvisor/pkg/sync" ) var totalTicks = metric.MustCreateNewUint64Metric("/memory_events/ticks", false /*sync*/, "Total number of memory event periods that have elapsed since startup.") |