summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-06-10 18:28:30 +0000
committergVisor bot <gvisor-bot@google.com>2020-06-10 18:28:30 +0000
commit500928d53a3078c1417570c0e5f328cad7333d37 (patch)
tree277a1a1fe1ed73439b13ab8628561f934ebdd25e /pkg/sentry
parentf5c6e5c747bdf805a69c8d93ced3fdb58f1dfb91 (diff)
parentf004bb8703b516a423e05111e8d0fc55b1a850d8 (diff)
Merge release-20200522.0-115-gf004bb870 (automated)
Diffstat (limited to 'pkg/sentry')
-rw-r--r--pkg/sentry/platform/ring0/defs_impl_arm64.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_arm64.go b/pkg/sentry/platform/ring0/defs_impl_arm64.go
index a5eface16..93f23047d 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 (
+ "fmt"
"gvisor.dev/gvisor/pkg/sentry/arch"
"gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
+ "io"
"reflect"
- "fmt"
"gvisor.dev/gvisor/pkg/usermem"
- "io"
)
// Useful bits.