diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-13 12:22:15 -0800 |
| commit | 31e49f4b19309259baeeb63e7b6ef41f8edd6d35 (patch) | |
| tree | ad6cae1ad4f173946eb68156653bea84d7254f81 /pkg/sentry/control | |
| parent | d147e6d1b29d25607bcdcdb0beddb5122fea085e (diff) | |
| parent | b30cfb1df72e201c6caf576bbef8fcc968df2d41 (diff) | |
Merge branch 'master' into iptables-write-input-drop
Diffstat (limited to 'pkg/sentry/control')
| -rw-r--r-- | pkg/sentry/control/BUILD | 1 | ||||
| -rw-r--r-- | pkg/sentry/control/pprof.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkg/sentry/control/BUILD b/pkg/sentry/control/BUILD index 5522cecd0..2561a6109 100644 --- a/pkg/sentry/control/BUILD +++ b/pkg/sentry/control/BUILD @@ -30,6 +30,7 @@ go_library( "//pkg/sentry/strace", "//pkg/sentry/usage", "//pkg/sentry/watchdog", + "//pkg/sync", "//pkg/tcpip/link/sniffer", "//pkg/urpc", ], diff --git a/pkg/sentry/control/pprof.go b/pkg/sentry/control/pprof.go index e1f2fea60..151808911 100644 --- a/pkg/sentry/control/pprof.go +++ b/pkg/sentry/control/pprof.go @@ -19,10 +19,10 @@ import ( "runtime" "runtime/pprof" "runtime/trace" - "sync" "gvisor.dev/gvisor/pkg/fd" "gvisor.dev/gvisor/pkg/sentry/kernel" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/urpc" ) |