summaryrefslogtreecommitdiffhomepage
path: root/pkg/sentry/platform
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-01-09 18:30:38 +0000
committergVisor bot <gvisor-bot@google.com>2020-01-09 18:30:38 +0000
commit24f832163fce3c37c1e616aa266521c7d98711c4 (patch)
tree5e4eaecfb5c260eb4a067729876722bbf0a1a8f3 /pkg/sentry/platform
parent73d3ec7eed1185ed9b84e39b3b100b242f0b7eeb (diff)
parent290908fa8ae2363c3d2a7af7cef8d5dda622cde7 (diff)
Merge release-20191213.0-84-g290908f (automated)
Diffstat (limited to 'pkg/sentry/platform')
-rwxr-xr-xpkg/sentry/platform/ring0/defs_impl_amd64.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/sentry/platform/ring0/defs_impl_amd64.go b/pkg/sentry/platform/ring0/defs_impl_amd64.go
index 58da90cf2..73404a116 100755
--- a/pkg/sentry/platform/ring0/defs_impl_amd64.go
+++ b/pkg/sentry/platform/ring0/defs_impl_amd64.go
@@ -1,14 +1,14 @@
package ring0
import (
- "fmt"
"gvisor.dev/gvisor/pkg/cpuid"
- "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
- "io"
"reflect"
"syscall"
+ "fmt"
+ "gvisor.dev/gvisor/pkg/sentry/platform/ring0/pagetables"
"gvisor.dev/gvisor/pkg/sentry/usermem"
+ "io"
)
// Kernel is a global kernel object.