diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-01-29 13:21:12 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-01-29 13:21:12 -0800 |
| commit | b615f94aeacb2c21bb59c8b44f303e7b7ca05ad6 (patch) | |
| tree | 79907e842eeba2a1f01acb5b5661800dc6ef2174 /pkg/sentry/hostmm | |
| parent | d6a2e01d3e57e0837c7e5cfda3b56c4dcfbb4627 (diff) | |
| parent | 148fda60e8dee29f2df85e3104e3d5de1a225bcf (diff) | |
Merge branch 'master' into ipt-udp-matchers
Diffstat (limited to 'pkg/sentry/hostmm')
| -rw-r--r-- | pkg/sentry/hostmm/BUILD | 5 | ||||
| -rw-r--r-- | pkg/sentry/hostmm/hostmm.go | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkg/sentry/hostmm/BUILD b/pkg/sentry/hostmm/BUILD index 67831d5a1..61c78569d 100644 --- a/pkg/sentry/hostmm/BUILD +++ b/pkg/sentry/hostmm/BUILD @@ -1,4 +1,4 @@ -load("//tools/go_stateify:defs.bzl", "go_library") +load("//tools:defs.bzl", "go_library") package(licenses = ["notice"]) @@ -8,11 +8,10 @@ go_library( "cgroup.go", "hostmm.go", ], - importpath = "gvisor.dev/gvisor/pkg/sentry/hostmm", visibility = ["//pkg/sentry:internal"], deps = [ "//pkg/fd", "//pkg/log", - "//pkg/sentry/usermem", + "//pkg/usermem", ], ) diff --git a/pkg/sentry/hostmm/hostmm.go b/pkg/sentry/hostmm/hostmm.go index 19335ca73..506c7864a 100644 --- a/pkg/sentry/hostmm/hostmm.go +++ b/pkg/sentry/hostmm/hostmm.go @@ -24,7 +24,7 @@ import ( "gvisor.dev/gvisor/pkg/fd" "gvisor.dev/gvisor/pkg/log" - "gvisor.dev/gvisor/pkg/sentry/usermem" + "gvisor.dev/gvisor/pkg/usermem" ) // NotifyCurrentMemcgPressureCallback requests that f is called whenever the |