diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-13 16:06:29 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-13 16:06:29 -0800 |
| commit | d51eaa59c020cca9b7bc27cec0338ead089f3ed6 (patch) | |
| tree | 3b41776af9426496567573ed17698562daf39006 /pkg/sentry/pgalloc/pgalloc.go | |
| parent | d793677cd424fef10ac0b080871d181db0bcdec0 (diff) | |
| parent | 1c3d3c70b93d483894dd49fb444171347f0ca250 (diff) | |
Merge branch 'iptables-write-input-drop' into iptables-write-filter-proto
Diffstat (limited to 'pkg/sentry/pgalloc/pgalloc.go')
| -rw-r--r-- | pkg/sentry/pgalloc/pgalloc.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/sentry/pgalloc/pgalloc.go b/pkg/sentry/pgalloc/pgalloc.go index f7f7298c4..c99e023d9 100644 --- a/pkg/sentry/pgalloc/pgalloc.go +++ b/pkg/sentry/pgalloc/pgalloc.go @@ -25,7 +25,6 @@ import ( "fmt" "math" "os" - "sync" "sync/atomic" "syscall" "time" @@ -37,6 +36,7 @@ import ( "gvisor.dev/gvisor/pkg/sentry/safemem" "gvisor.dev/gvisor/pkg/sentry/usage" "gvisor.dev/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/sync" "gvisor.dev/gvisor/pkg/syserror" ) |