summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-09-11 09:00:56 +0000
committergVisor bot <gvisor-bot@google.com>2020-09-11 09:00:56 +0000
commitb4312fa7cc07870284ea9dfbc5bcc55cf3617ecb (patch)
tree071ccf3f9b5fdc3edf4199720b05eac0c92bb8cf /pkg/sentry/platform
parenta9b8163485d5fab4a27410b4a14d9ec5df5c317c (diff)
parent964447c8ce1ba4f3c7413e90069a045fe0877c2a (diff)
Merge release-20200907.0-31-g964447c8c (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index eda1e1484..8ebfbfdb6 100644
--- a/pkg/sentry/platform/ring0/defs_impl_arm64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_arm64.go
@@ -1,13 +1,13 @@
package ring0
import (
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+
"fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
- "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+ "gvisor.dev/gvisor/pkg/usermem"
"io"
"reflect"
-
- "gvisor.dev/gvisor/pkg/usermem"
)
// Useful bits.